Moved generated data to optimize directory

wazuh · Jun 12, 2018 · 96407a7 · 96407a7
1 parent 9f2799f
commit 96407a7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/server/controllers/wazuh-api.js b/server/controllers/wazuh-api.js
@@ -603,13 +603,13 @@ export default class WazuhApi {
     async report(req,reply) {
         try {
 
-            if (!fs.existsSync(path.join(__dirname, '../../../wazuh-reporting'))) {
-                fs.mkdirSync(path.join(__dirname, '../../../wazuh-reporting'));
+            if (!fs.existsSync(path.join(__dirname, '../../../../optimize/wazuh-reporting'))) {
+                fs.mkdirSync(path.join(__dirname, '../../../../optimize/wazuh-reporting'));
             }
 
             if(req.payload && req.payload.array){
                 const doc = new PDFDocument();
-                doc.pipe(fs.createWriteStream(path.join(__dirname, '../../../wazuh-reporting/' + req.payload.name)));
+                doc.pipe(fs.createWriteStream(path.join(__dirname, '../../../../optimize/wazuh-reporting/' + req.payload.name)));
                 doc.image(path.join(__dirname, '../../public/img/logo.png'),410,20,{fit:[150,70]})
                 doc.moveDown().fontSize(9).fillColor('blue').text('https://wazuh.com',442,50,{link: 'https://wazuh.com', underline:true, valign:'right', align: 'right'})
 
@@ -697,21 +697,21 @@ export default class WazuhApi {
         } catch (error) {
             // Delete generated file if an error occurred
             if(req && req.payload && req.payload.name && 
-               fs.existsSync(path.join(__dirname, '../../../wazuh-reporting/' + req.payload.name))
+               fs.existsSync(path.join(__dirname, '../../../../optimize/wazuh-reporting/' + req.payload.name))
             ) {
-                fs.unlinkSync(path.join(__dirname, '../../../wazuh-reporting/' + req.payload.name))
+                fs.unlinkSync(path.join(__dirname, '../../../../optimize/wazuh-reporting/' + req.payload.name))
             }
             return ErrorResponse(error.message || error, 3029, 500, reply);
         }
     }
 
     async getReports(req,reply) {
         try {
-            if (!fs.existsSync(path.join(__dirname, '../../../wazuh-reporting'))) {
-                fs.mkdirSync(path.join(__dirname, '../../../wazuh-reporting'));
+            if (!fs.existsSync(path.join(__dirname, '../../../../optimize/wazuh-reporting'))) {
+                fs.mkdirSync(path.join(__dirname, '../../../../optimize/wazuh-reporting'));
             }
             const list = [];
-            const reportDir = path.join(__dirname, '../../../wazuh-reporting');
+            const reportDir = path.join(__dirname, '../../../../optimize/wazuh-reporting');
             const sortFunction = (a,b) => a.date < b.date ? 1 : a.date > b.date ? -1 : 0;
             fs.readdirSync(reportDir).forEach(file => {
                 const stats = fs.statSync(reportDir + '/' + file);
@@ -731,7 +731,7 @@ export default class WazuhApi {
 
     async getReportByName(req,reply) {
         try {
-            return reply.file(path.join(__dirname, '../../../wazuh-reporting/' + req.params.name));
+            return reply.file(path.join(__dirname, '../../../../optimize/wazuh-reporting/' + req.params.name));
         } catch (error) {
             return ErrorResponse(error.message || error, 3030, 500, reply);
         }
@@ -750,7 +750,7 @@ export default class WazuhApi {
 
     async deleteReportByName(req,reply) {
         try {
-            fs.unlinkSync(path.join(__dirname, '../../../wazuh-reporting/' + req.params.name))
+            fs.unlinkSync(path.join(__dirname, '../../../../optimize/wazuh-reporting/' + req.params.name))
             return reply({error:0})
         } catch (error) {
             return ErrorResponse(error.message || error, 3032, 500, reply);

diff --git a/server/logger.js b/server/logger.js
@@ -16,7 +16,7 @@ import path    from 'path';
 let allowed = false;
 
 /** 
- * Checks if ../../wazuh-logs exists. If it doesn't exist, it will be created.
+ * Checks if wazuh-logs exists. If it doesn't exist, it will be created.
  */
 const initDirectory = () => {
     try{
@@ -27,8 +27,8 @@ const initDirectory = () => {
             throw new Error('Kibana is out of /usr/share/kibana path and the Wazuh App is inside plugins directory')
 
         }
-        if (!fs.existsSync(path.join(__dirname, '../../wazuh-logs'))) {
-            fs.mkdirSync(path.join(__dirname, '../../wazuh-logs'));
+        if (!fs.existsSync(path.join(__dirname, '../../../optimize/wazuh-logs'))) {
+            fs.mkdirSync(path.join(__dirname, '../../../optimize/wazuh-logs'));
         }
         allowed = true;
         return;
@@ -46,7 +46,7 @@ const wazuhlogger = winston.createLogger({
     format    : winston.format.json(),
     transports: [
         new winston.transports.File({
-            filename: path.join(__dirname, '../../wazuh-logs/wazuhapp.log')
+            filename: path.join(__dirname, '../../../optimize/wazuh-logs/wazuhapp.log')
         })
     ]
 });
@@ -77,10 +77,10 @@ const getFilesizeInMegaBytes = filename => {
  */
 const checkFiles = () => {
     if(allowed){
-        if (getFilesizeInMegaBytes(path.join(__dirname, '../../wazuh-logs/wazuhapp.log')) >= 100) {
+        if (getFilesizeInMegaBytes(path.join(__dirname, '../../../optimize/wazuh-logs/wazuhapp.log')) >= 100) {
             fs.renameSync(
-                path.join(__dirname, '../../wazuh-logs/wazuhapp.log'),
-                path.join(__dirname, `../../wazuh-logs/wazuhapp.${new Date().getTime()}.log`)
+                path.join(__dirname, '../../../optimize/wazuh-logs/wazuhapp.log'),
+                path.join(__dirname, `../../../optimize/wazuh-logs/wazuhapp.${new Date().getTime()}.log`)
             )
         }
     }