From f01a2fc54936a95df3e72be2d014ac82754e96cf Mon Sep 17 00:00:00 2001
From: Kevin Smets <kevin.smets2@kbc.be>
Date: Fri, 15 Jan 2016 12:37:02 +0100
Subject: [PATCH 1/2] Update log4js's typings

---
 log4js/log4js.d.ts | 45 +++++++++++++++++++++++++++++----------------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/log4js/log4js.d.ts b/log4js/log4js.d.ts
index 4888b9f518..4a1160ec1b 100644
--- a/log4js/log4js.d.ts
+++ b/log4js/log4js.d.ts
@@ -8,6 +8,20 @@
 declare module "log4js" {
   import express = require('express');
 
+  /**
+   * Replaces the console
+   * @param logger
+   * @returns void
+   */
+  export function replaceConsole(logger?: Logger): void;
+
+  /**
+   * Restores the console
+   * @param logger
+   * @returns void
+   */
+  export function restoreConsole(logger?: Logger): void;
+
   /**
    * Get a logger instance. Instance is cached on categoryName level.
    *
@@ -137,7 +151,7 @@ declare module "log4js" {
   }
 
   export interface ConsoleAppenderConfig extends AppenderConfigBase {}
-  
+
   export interface FileAppenderConfig extends AppenderConfigBase {
     filename: string;
   }
@@ -156,24 +170,24 @@ declare module "log4js" {
     pattern: string;
     alwaysIncludePattern: boolean;
   }
-  
+
   export interface SmtpAppenderConfig extends AppenderConfigBase {
     /** Comma separated list of email recipients */
     recipients: string;
-    
+
     /** Sender of all emails (defaults to transport user) */
     sender: string;
-    
+
     /** Subject of all email messages (defaults to first event's message)*/
     subject: string;
-    
+
     /**
      * The time in seconds between sending attempts (defaults to 0).
      * All events are buffered and sent in one email during this time.
      * If 0 then every event sends an email
      */
     sendInterval: number;
-    
+
     SMTP: {
       host: string;
       secure: boolean;
@@ -190,14 +204,14 @@ declare module "log4js" {
     backup: number;
     pollInterval: number;
   }
-  
+
   export interface GelfAppenderConfig extends AppenderConfigBase {
     host: string;
     hostname: string;
     port: string;
     facility: string;
   }
-  
+
   export interface MultiprocessAppenderConfig extends AppenderConfigBase {
     mode: string;
     loggerPort: number;
@@ -205,25 +219,25 @@ declare module "log4js" {
     facility: string;
     appender?: AppenderConfig;
   }
-  
+
   export interface LogglyAppenderConfig extends AppenderConfigBase {
     /** Loggly customer token - https://www.loggly.com/docs/api-sending-data/ */
     token: string;
-    
+
     /** Loggly customer subdomain (use 'abc' for abc.loggly.com) */
     subdomain: string;
-    
+
     /** an array of strings to help segment your data & narrow down search results in Loggly */
     tags: string[];
-    
+
     /** Enable JSON logging by setting to 'true' */
     json: boolean;
   }
-  
+
   export interface ClusteredAppenderConfig extends AppenderConfigBase {
     appenders?: AppenderConfig[];
   }
-  
+
   type CoreAppenderConfig = ConsoleAppenderConfig
                           | FileAppenderConfig
                           | DateFileAppenderConfig
@@ -233,11 +247,10 @@ declare module "log4js" {
                           | MultiprocessAppenderConfig
                           | LogglyAppenderConfig
                           | ClusteredAppenderConfig
-    
+
   interface CustomAppenderConfig extends AppenderConfigBase {
     [prop: string]: any;
   }
 
   type AppenderConfig = CoreAppenderConfig | CustomAppenderConfig;
 }
-

From 7554cff7c4dd34decc2f3dc0d711a6c288174eee Mon Sep 17 00:00:00 2001
From: Kevin Smets <kevin.smets2@kbc.be>
Date: Fri, 15 Jan 2016 20:26:20 +0100
Subject: [PATCH 2/2] Fixed restoreConsole

---
 log4js/log4js.d.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/log4js/log4js.d.ts b/log4js/log4js.d.ts
index 4a1160ec1b..ab172a1221 100644
--- a/log4js/log4js.d.ts
+++ b/log4js/log4js.d.ts
@@ -17,10 +17,9 @@ declare module "log4js" {
 
   /**
    * Restores the console
-   * @param logger
    * @returns void
    */
-  export function restoreConsole(logger?: Logger): void;
+  export function restoreConsole(): void;
 
   /**
    * Get a logger instance. Instance is cached on categoryName level.