Merge pull request javieraviles#41 from javieraviles/develop

Release 1.4.2

README.md

@@ -364,6 +364,11 @@ To install or update these dependencies you can use `npm install` or `npm update
 
 ## Changelog
 
+### 1.4.2
+ - Fix -> `npm run watch-server` is now working properly live-reloading changes in the code [Issue 39](https://github.com/javieraviles/node-typescript-koa-rest/issues/39).
+ - Fix -> Logging levels were not correctly mapped. Thanks to @atamano for the PR [Pull Request 35](https://github.com/javieraviles/node-typescript-koa-rest/pull/35)
+ - Some code leftovers removed
+
 ### 1.4.1
 - Fix -> After updating winston to 3.0.0, it was throwing an error when logging errors into file
 - Fix -> Config in config.ts wasn't implementing IConfig interface

package.json

@@ -1,10 +1,10 @@
 {
   "name": "node-typescript-koa-rest",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "API REST using NodeJS and KOA framework, typescript. TypeORM for SQL with class-validators. Middlewares JWT, CORS, Winston Logger.",
   "main": "dist/server.js",
   "scripts": {
-    "watch-server": "nodemon --watch 'src/**/*' -e ts,tsx --exec ts-node src/server.ts",
+    "watch-server": "nodemon --watch src -e ts,tsx --exec ts-node src/server.ts",
     "build-ts": "tsc",
     "copy-static-assets": "ts-node copyStaticAssets.ts",
     "tslint": "tslint -c tslint.json -p tsconfig.json",

src/logging.ts

@@ -3,6 +3,21 @@ import { config } from './config';
 import * as winston from 'winston';
 
 export function logger(winstonInstance) {
+    winstonInstance.configure({
+        level: config.debugLogging ? 'debug' : 'info',
+        transports: [
+            //
+            // - Write all logs error (and below) to `error.log`.
+            new winston.transports.File({ filename: 'error.log', level: 'error' }),
+            //
+            // - Write to all logs with specified level to console.
+            new winston.transports.Console({ format: winston.format.combine(
+                winston.format.colorize(),
+                winston.format.simple()
+              ) })
+        ]
+    });
+
     return async(ctx: Koa.Context, next: () => Promise<any>) => {
 
         const start = new Date().getMilliseconds();
@@ -14,31 +29,14 @@ export function logger(winstonInstance) {
         let logLevel: string;
         if (ctx.status >= 500) {
             logLevel = 'error';
-        }
-        if (ctx.status >= 400) {
+        } else if (ctx.status >= 400) {
             logLevel = 'warn';
-        }
-        if (ctx.status >= 100) {
+        } else if (ctx.status >= 100) {
             logLevel = 'info';
         }
 
         const msg: string = `${ctx.method} ${ctx.originalUrl} ${ctx.status} ${ms}ms`;
 
-        winstonInstance.configure({
-            level: config.debugLogging ? 'debug' : 'info',
-            transports: [
-                //
-                // - Write all logs error (and below) to `error.log`.
-                new winston.transports.File({ filename: 'error.log', level: 'error' }),
-                //
-                // - Write to all logs with specified level to console.
-                new winston.transports.Console({ format: winston.format.combine(
-                    winston.format.colorize(),
-                    winston.format.simple()
-                  ) })
-            ]
-        });
-
         winstonInstance.log(logLevel, msg);
     };
-}
+}

src/server.ts

@@ -4,7 +4,6 @@ import * as bodyParser from 'koa-bodyparser';
 import * as helmet from 'koa-helmet';
 import * as cors from '@koa/cors';
 import * as winston from 'winston';
-import * as dotenv from 'dotenv';
 import { createConnection } from 'typeorm';
 import 'reflect-metadata';
 import * as PostgressConnectionStringParser from 'pg-connection-string';
@@ -13,9 +12,6 @@ import { logger } from './logging';
 import { config } from './config';
 import { router } from './routes';
 
-// Load environment variables from .env file, where API keys and passwords are configured
-dotenv.config({ path: '.env' });
-
 // Get DB connection options from env variable
 const connectionOptions = PostgressConnectionStringParser.parse(config.databaseUrl);