@fonoster/logger 0.8.59 → 0.9.7

package/dist/envs.d.ts

@@ -1,5 +1,5 @@
 import winston from "winston";
-declare const LOGS_LEVEL: string;
+declare const LOGS_LEVEL: any;
 declare const fluent: any;
 declare const format: winston.Logform.Format;
 declare const transports: any[];

package/dist/envs.js

@@ -24,14 +24,16 @@ exports.transports = exports.level = exports.format = exports.fluent = void 0;
  */
 const fluent_logger_1 = __importDefault(require("fluent-logger"));
 const winston_1 = __importDefault(require("winston"));
+const getEnv_1 = require("./getEnv");
 const FluentTransport = fluent_logger_1.default.support.winstonTransport();
-const LOGS_DRIVER_HOST = process.env.LOGS_DRIVER_HOST;
-const LOGS_DRIVER_PORT = process.env.LOGS_DRIVER_PORT || 24224;
-const LOGS_OPT_TAG_PREFIX = process.env.LOGS_OPT_TAG_PREFIX || "fonoster-logs";
-const LOGS_FORMAT = process.env.LOGS_FORMAT || "json";
-const LOGS_LEVEL = process.env.LOGS_LEVEL || "info";
+const LOGS_DRIVER_HOST = (0, getEnv_1.getEnv)("LOGS_DRIVER_HOST");
+// Note: if LOGS_DRIVER_PORT is provided as a string in the environment, it will be used as-is.
+const LOGS_DRIVER_PORT = (0, getEnv_1.getEnv)("LOGS_DRIVER_PORT", 24224);
+const LOGS_OPT_TAG_PREFIX = (0, getEnv_1.getEnv)("LOGS_OPT_TAG_PREFIX", "fonoster-logs");
+const LOGS_FORMAT = (0, getEnv_1.getEnv)("LOGS_FORMAT", "json");
+const LOGS_LEVEL = (0, getEnv_1.getEnv)("LOGS_LEVEL", "info");
 exports.level = LOGS_LEVEL;
-const LOGS_TRANSPORT = process.env.LOGS_TRANSPORT || "console";
+const LOGS_TRANSPORT = (0, getEnv_1.getEnv)("LOGS_TRANSPORT", "console");
 const fluent = new FluentTransport(`${LOGS_OPT_TAG_PREFIX}`, {
     host: LOGS_DRIVER_HOST,
     port: LOGS_DRIVER_PORT,

package/dist/getEnv.d.ts

@@ -0,0 +1,2 @@
+declare function getEnv(key: string, defaultValue?: any): any;
+export { getEnv };

package/dist/getEnv.js

@@ -0,0 +1,32 @@
+"use strict";
+/*
+ * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
+ * http://github.com/fonoster/fonoster
+ *
+ * This file is part of Fonoster
+ *
+ * Licensed under the MIT License (the "License");
+ * you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *    https://opensource.org/licenses/MIT
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getEnv = getEnv;
+// Add a helper function that will check for a service-prefixed environment variable
+// For example, for key "LOGS_FORMAT" it will return process.env.APISERVER_LOGS_FORMAT if exists,
+// and fall back to process.env.LOGS_FORMAT otherwise.
+function getEnv(key, defaultValue) {
+    // Look for any environment variable that is a service-prefixed variable (e.g. APISERVER_LOGS_FORMAT)
+    const prefixedKey = Object.keys(process.env).find(envKey => envKey !== key && envKey.endsWith(`_${key}`));
+    if (prefixedKey !== undefined && process.env[prefixedKey] !== undefined) {
+        return process.env[prefixedKey];
+    }
+    return process.env[key] !== undefined ? process.env[key] : defaultValue;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fonoster/logger",
-  "version": "0.8.59",
+  "version": "0.9.7",
   "description": "Logger module",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/fonoster#readme",
@@ -32,5 +32,5 @@
     "fluent-logger": "^3.4.1",
     "winston": "^3.13.0"
   },
-  "gitHead": "6a5255febb9e4bcd9184d93abe72281f945c8c4d"
+  "gitHead": "58373b604b2e29bcfc6b88a2f30ae45afb4e97a7"
 }