sslconfig needs to look only one level up instead of two for certs af…

…ter service folder restructuring (#1171) * sslconfig needs to look only one level up instead of two for certs after service folder restructuring * write error details to log when dependency setup fails
NUWCDIVNPT · Jan 5, 2024 · 44f8f57 · 44f8f57
1 parent fbf6a96
commit 44f8f57
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/api/source/index.js b/api/source/index.js
@@ -231,7 +231,7 @@ async function startServer(app) {
       ;[authReturn, isNewDb] = await Promise.all([auth.initializeAuth(), db.initializeDatabase()])
     }
     catch (e) {
-      logger.writeError('index', 'shutdown', {message:'Failed to setup dependencies'});
+      logger.writeError('index', 'shutdown', {message:'Failed to setup dependencies', error: serializeError(e)});
       process.exit(1);  
     }
 

diff --git a/api/source/service/utils.js b/api/source/service/utils.js
@@ -41,13 +41,13 @@ function getPoolConfig() {
   if (config.database.tls.ca_file || config.database.tls.cert_file || config.database.tls.key_file) {
     const sslConfig = {}
     if (config.database.tls.ca_file) {
-      sslConfig.ca = fs.readFileSync(path.join(__dirname, '..', '..', 'tls', config.database.tls.ca_file))
+      sslConfig.ca = fs.readFileSync(path.join(__dirname, '..', 'tls', config.database.tls.ca_file))
     }
     if (config.database.tls.cert_file) {
-      sslConfig.cert = fs.readFileSync(path.join(__dirname, '..', '..', 'tls', config.database.tls.cert_file))
+      sslConfig.cert = fs.readFileSync(path.join(__dirname, '..', 'tls', config.database.tls.cert_file))
     }
     if (config.database.tls.key_file) {
-      sslConfig.key = fs.readFileSync(path.join(__dirname, '..', '..', 'tls', config.database.tls.key_file))
+      sslConfig.key = fs.readFileSync(path.join(__dirname, '..', 'tls', config.database.tls.key_file))
     }
     poolConfig.ssl = sslConfig
   }