[mikrotik-dhcp] remove filename from logging

Author: geoffhouse

TODO.md

@@ -14,7 +14,6 @@
 - need to use UTC for all panel dates
 - add panel toolbar menu to logs page
 - update mikrotik modules using new core class
-- codecs should show green when connected
 - explain admin/user
 - disable UI for actions for users
 - use health check in modules
@@ -25,5 +24,4 @@
 - do I need a way to view some basic info on a device? Maybe a details view expandable from the home screen with device name, model, IP, contact details etc
 - do I remove the menu on the home page tiles and just have an expand icon?
 - use rounding on sparklines to reduce bps noise
-- notifications bell in toolbar shouldn't show with default messages
 - when module is archived give warning

src/modules/mikrotik-dhcp/TODO.md

@@ -2,5 +2,4 @@
 - add dhcp pool number left to mikrotik dhcp module
 - mikrotik-dhcp should warn when pools are full
 - update db on lease changes
-- remove filename from all log actions......
 - add heartbeat status check and worker task

src/modules/mikrotik-dhcp/container/services/addresslists-list.js

@@ -19,7 +19,7 @@ module.exports = async () => {
 
         return addressLists;
     } catch (err) {
-        err.message = `addresslists-list: ${err.stack || err.message}`;
+        err.message = err.stack || err.message;
         logger.error(err.message);
         throw err;
     }

src/modules/mikrotik-dhcp/container/services/dhcpserver-list.js

@@ -24,7 +24,7 @@ module.exports = async () => {
             };
         });
     } catch (err) {
-        err.message = `dhcpserver-list: ${err.stack || err.message}`;
+        err.message = err.stack || err.message;
         logger.error(err.message);
         throw err;
     }

src/modules/mikrotik-dhcp/container/services/lease-add.js

@@ -37,13 +37,13 @@ module.exports = async (params) => {
             paramArray.push(`=comment=${params.comment}`)
         }
 
-        logger.debug(`lease-info: adding lease with params ${JSON.stringify(params)}`);
+        logger.debug(`Adding lease with params ${JSON.stringify(params)}`);
 
         await routerOsApi.run("/ip/dhcp-server/lease/add", paramArray);
-        logger.info(`lease-add: added lease for address ${params.address}`);
+        logger.info(`Added lease for address ${params.address}`);
         return true;
     } catch (err) {
-        err.message = `lease-add: ${err.stack || err.message}`;
+        err.message = err.stack || err.message;
         logger.error(err.message);
         throw err;
     }

src/modules/mikrotik-dhcp/container/services/lease-comment.js

@@ -24,7 +24,7 @@ module.exports = async (leaseId, comment) => {
         //TODO update db
         return true;
     } catch (err) {
-        err.message = `lease-comment: ${err.stack || err.message}`;
+        err.message = err.stack || err.message;
         logger.error(err.message);
         throw err;
     }

src/modules/mikrotik-dhcp/container/services/lease-delete.js

@@ -21,7 +21,7 @@ module.exports = async (leaseId) => {
         });
 
         await routerOsApi.run("/ip/dhcp-server/lease/remove", ["=numbers=" + leaseId]);
-        logger.info(`mikrotik-leasedelete: removed lease id ${leaseId}`);
+        logger.info(`Removed lease id ${leaseId}`);
 
         // now update local db
         const dbLeases = await mongoCollection("leases");
@@ -30,7 +30,7 @@ module.exports = async (leaseId) => {
         return true;
 
     } catch (err) {
-        err.message = `lease-delete: ${err.stack || err.message}`;
+        err.message = err.stack || err.message;
         logger.error(err.message);
         throw err;
     }

src/modules/mikrotik-dhcp/container/services/lease-disable.js

@@ -20,10 +20,10 @@ module.exports = async (leaseId) => {
         });
 
         await routerOsApi.run("/ip/dhcp-server/lease/disable", ["=numbers=" + leaseId]);
-        logger.info(`lease-disable: disabled lease id ${leaseId}`);
+        logger.info(`Disabled lease id ${leaseId}`);
         return true;
     } catch (err) {
-        err.message = `lease-disable: ${err.stack || err.message}`;
+        err.message = err.stack || err.message;
         logger.error(err.message);
         throw err;
     }

src/modules/mikrotik-dhcp/container/services/lease-enable.js

@@ -20,10 +20,10 @@ module.exports = async (leaseId) => {
         });
 
         await routerOsApi.run("/ip/dhcp-server/lease/enable", ["=numbers=" + leaseId]);
-        logger.info(`lease-enable: enabled lease id ${leaseId}`);
+        logger.info(`Enabled lease id ${leaseId}`);
         return true;
     } catch (err) {
-        err.message = `lease-enable: ${err.stack || err.message}`;
+        err.message = err.stack || err.message;
         logger.error(err.message);
         throw err;
     }

src/modules/mikrotik-dhcp/container/services/lease-get.js

@@ -23,7 +23,7 @@ module.exports = async (leaseId) => {
 
         return lease;
     } catch (err) {
-        err.message = `lease-get: ${err.stack || err.message}`;
+        err.message = err.stack || err.message;
         logger.error(err.message);
         throw err;
     }