Fix #30 partial config updates

vtfk · Nov 17, 2020 · 10aaf16 · 10aaf16
1 parent e19f212
commit 10aaf16
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 2 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -18,6 +18,7 @@
   "author": "Ingar Helgesen (https://github.com/sherex)",
   "license": "MIT",
   "dependencies": {
+    "deepmerge": "^4.2.2",
     "pkg-dir": "^4.2.0",
     "syslog-client": "^1.1.1"
   },

diff --git a/src/index.js b/src/index.js
@@ -1,4 +1,5 @@
 const syslog = require('syslog-client')
+const deepmerge = require('deepmerge')
 const logLevelMapper = require('./lib/log-level-mapper')
 const formatDateTime = require('./lib/format-date-time')
 const { pkg } = require('./lib/get-package-json')
@@ -14,6 +15,7 @@ const loggerOptions = {
 // Dependencies for the imported factory functions
 const logConfigDeps = {
   syslog,
+  deepmerge,
   loggerOptions,
   envVariables: process.env
 }

diff --git a/src/lib/log-config-factory.js b/src/lib/log-config-factory.js
@@ -1,9 +1,12 @@
 function _logConfigFactory (options = {},
   {
     syslog,
+    deepmerge,
     loggerOptions,
     envVariables
   }) {
+  options = deepmerge(loggerOptions.previousOptions, options)
+  loggerOptions.previousOptions = options
   if (
     (!options || !options.remote) &&
     envVariables.PAPERTRAIL_HOST &&

diff --git a/src/lib/log-config-factory.test.js b/src/lib/log-config-factory.test.js
@@ -1,3 +1,4 @@
+const deepmerge = require('deepmerge')
 const logConfigFactory = require('./log-config-factory')
 
 function createLogConfig (fakeDeps, options) {
@@ -8,6 +9,7 @@ function createLogConfig (fakeDeps, options) {
         Udp: 'udp'
       }
     },
+    deepmerge,
     loggerOptions: {},
     envVariables: {},
     ...fakeDeps