Merge branch 'fix/new-log-fenix-log-retrieval' into 'develop'

fix: add new log fenix for log retrieval

See merge request prey/js/prey-node-client!1298

Author: Javier Acuna

lib/agent/actions/logretrieval/index.js

@@ -31,7 +31,6 @@ const READ_TIMEOUT = 2000;
 let em;
 let cp;
 let LOG_PATH;
-let FENIX_LOG_PATH;
 let CONF_PATH;
 let ROTATED_PATH;
 let WINSVC_LOG;
@@ -70,7 +69,7 @@ exports.collectFiles = (outputFile, cb) => {
     { path: ROTATED_PATH, name: 'prey.log.1.gz' },
     ...(os.platform() === 'win32' ? [ // Only for windows add admin service logs
       { path: WINSVC_LOG, name: 'winsvc.log' },
-      { path: FENIX_LOG_PATH, name: 'fenix.log' },
+      { path: paths.program_data, name: 'fenix.log' },
       { path: WINSVC_UPDATER, name: 'updater.log' },
     ] : []),
   ];
@@ -83,12 +82,18 @@ exports.collectFiles = (outputFile, cb) => {
     }
     array.push((callback) => {
       let fileData = '';
+      let hasError = false;
       const rs = fs.createReadStream(file.path);
-      rs.on('error', () => {
+
+      rs.on('error', (error) => {
+        hasError = true;
+        logger.info(`There was an error reading file ${file.name}: ${error}`);
+        rs.destroy();
         callback();
       });
 
       rs.on('data', (data) => {
+        if (hasError) return;
         try {
           if (!data) logger.info(`There was an error reading file ${file.name}: no data`);
           if (fileData) fileData = fileData.toString().concat(data);
@@ -99,12 +104,13 @@ exports.collectFiles = (outputFile, cb) => {
       });
 
       rs.on('close', () => {
+        if (hasError) return;
         try {
           archive.append(fileData || '', { name: file.name });
+          callback();
         } catch (error) {
           logger.info(`There was an error appending file ${file.name} to archive: ${error}`);
         }
-        callback();
       });
     });
   });
@@ -222,7 +228,6 @@ const promises = [
 
 exports.start = (id, options, cb) => {
   LOG_PATH = paths.log_file;
-  FENIX_LOG_PATH = join(CONFIG_PATH, 'fenix.log');
   CONF_PATH = join(CONFIG_PATH, 'prey.conf');
   ROTATED_PATH = join(CONFIG_PATH, 'prey.log.1.gz');
   WINSVC_LOG = join(CONFIG_PATH, 'winsvc.log');

lib/system/windows/paths.js

@@ -1,6 +1,7 @@
-exports.bin      = 'prey.cmd';
-exports.config   = process.env.WINDIR + '\\Prey'; // __dirname + '/../../../'
-exports.temp     = process.env.WINDIR + '\\Temp';
-exports.log      = exports.config;
-exports.log_file = exports.log + '\\prey.log';
-exports.log_restarts = exports.log + '\\prey_restarts.log';
+exports.bin = 'prey.cmd';
+exports.config = `${process.env.WINDIR}\\Prey`; // __dirname + '/../../../'
+exports.temp = `${process.env.WINDIR}\\Temp`;
+exports.program_data = `${process.env.ProgramData}\\prey\\fenix.log`;
+exports.log = exports.config;
+exports.log_file = `${exports.log}\\prey.log`;
+exports.log_restarts = `${exports.log}\\prey_restarts.log`;