fleetmap-reports 1.0.745 → 1.0.747

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.745",
+  "version": "1.0.747",
   "description": "",
   "main": "src/index.js",
   "scripts": {

package/src/automaticReports.js

@@ -8,6 +8,7 @@ function sliceArray (longArray, size) {
   const arrayToSlice = longArray.slice()
 
   const arrayOfArrays = []
+  console.log('slice', arrayToSlice.length, 'in', size, 'chunks')
   for (let i = 0; i < arrayToSlice.length; i += size) {
     arrayOfArrays.push(arrayToSlice.slice(i, i + size))
   }

package/src/trip-report.js

@@ -23,19 +23,16 @@ const { parallel } = require('./util/parallel')
 const fileName = 'TripReport'
 
 async function createTripReport (from, to, userData, traccar) {
-  console.log('Create TripReport')
+  console.log('createTripReport', from, to, userData.byDriver ? 'by driver' : userData.byGroup ? 'by group' : 'by device')
   const reportData = []
 
   if (userData.byDriver) {
-    console.log('ByDriver')
     const report = await createTripReportByDriver(from, to, userData, traccar)
     reportData.push(report)
   } else if (userData.byGroup) {
-    console.log('ByGroup')
     const allData = await createTripReportByGroup(from, to, userData, traccar)
     reportData.push(...allData)
   } else {
-    console.log('ByDevice')
     const report = await createTripReportByDevice(from, to, userData, traccar)
     reportData.push(report)
   }

package/src/util/parallel.js

@@ -7,16 +7,14 @@ exports.parallel = (report, method, toSlice, ...args) => {
   return new Promise((resolve, reject) => {
     if (cluster.isPrimary) {
       console.log('master', process.pid, 'is running', process.cwd(), 'with', numCPUs, 'cpus')
-      console.log('setupPrimary', cluster.setupPrimary({
-        exec: path.resolve(__dirname, 'worker.js')
-      }), __dirname, 'worker.js')
+      cluster.setupPrimary({ exec: path.resolve(__dirname, 'worker.js') })
       const sliced = toSlice.length > (numCPUs - 1) ? sliceArray(toSlice, toSlice.length / (numCPUs - 1)) : toSlice
       const _result = []
       let done = 0
       let workerCount = 0
       sliced.forEach((slice) => {
         try {
-          console.log('forking worker', workerCount++, report, method, 'len', slice.length)
+          console.log('forking worker', workerCount++, report, method, slice)
           const worker = cluster.fork()
           worker.send({
             report,