From be73464fa17d5ee20eed3410b1508a0e6371cea3 Mon Sep 17 00:00:00 2001 From: Eric Byers Date: Wed, 7 Dec 2016 15:06:52 -0600 Subject: [PATCH 1/4] Adding ftpd logLevel to options and runtime, also adding tests --- ftpd/ftpd-tests.ts | 8 +++++--- ftpd/index.d.ts | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/ftpd/ftpd-tests.ts b/ftpd/ftpd-tests.ts index 8942dedcb7..d2d7141078 100644 --- a/ftpd/ftpd-tests.ts +++ b/ftpd/ftpd-tests.ts @@ -9,7 +9,8 @@ var options: ftpd.FtpServerOptions = { }, getRoot: function(connection: ftpd.FtpConnection): string { return '/'; - } + }, + logLevel: ftpd.LogLevel.ERROR }; var host: string = '10.0.0.42'; @@ -21,11 +22,12 @@ server.on('client:connected', function(conn: ftpd.FtpConnection): void { success(); }); conn.on('command:pass', function( - pass: string, - success: (username: string, fs?: ftpd.FtpFileSystem) => void, + pass: string, + success: (username: string, fs?: ftpd.FtpFileSystem) => void, failure: () => void) { success("Rogier"); }); }); +server.debugging = ftpd.LogLevel.NOTICE; server.listen(21); diff --git a/ftpd/index.d.ts b/ftpd/index.d.ts index 6e3230dd3b..a7f49775ae 100644 --- a/ftpd/index.d.ts +++ b/ftpd/index.d.ts @@ -12,6 +12,14 @@ import fs = require("fs"); import net = require("net"); import tls = require("tls"); +export interface LogLevel { + ERROR: 0; + WARN: 1; + INFO: 2; + DEBUG: 3; + TRACE: 4; +} + /** * Options for FtpServer constructor */ @@ -85,6 +93,11 @@ export interface FtpServerOptions { * Integer, specifies the upper-bound port (max port) for creating PASV connections */ pasvPortRangeEnd?: number; + /** + * Integer from 0-4 representing the Log Level to show. + */ + logLevel?: LogLevel; + } /** @@ -195,4 +208,9 @@ export declare class FtpServer extends events.EventEmitter { * Stop listening */ public close(callback?: () => void): void; + + /** + * Change/Retrieve logLevel at runtime. + */ + public debugging:LogLevel; } From 8800e84b834f6a050314e282e12f9d3f6bf08336 Mon Sep 17 00:00:00 2001 From: Eric Byers Date: Wed, 7 Dec 2016 15:22:38 -0600 Subject: [PATCH 2/4] Exporting an enum instead of an interface --- ftpd/index.d.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ftpd/index.d.ts b/ftpd/index.d.ts index a7f49775ae..9f11e76e79 100644 --- a/ftpd/index.d.ts +++ b/ftpd/index.d.ts @@ -12,12 +12,12 @@ import fs = require("fs"); import net = require("net"); import tls = require("tls"); -export interface LogLevel { - ERROR: 0; - WARN: 1; - INFO: 2; - DEBUG: 3; - TRACE: 4; +export enum LogLevel { + ERROR = 0, + WARN = 1, + INFO = 2, + DEBUG = 3, + TRACE = 4 } /** From 50ee7005f0536ccfdf6caf349ccf84111bff571b Mon Sep 17 00:00:00 2001 From: Eric Byers Date: Wed, 7 Dec 2016 15:25:52 -0600 Subject: [PATCH 3/4] Should probably follow the actual ENUM --- ftpd/ftpd-tests.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ftpd/ftpd-tests.ts b/ftpd/ftpd-tests.ts index d2d7141078..671ccf7053 100644 --- a/ftpd/ftpd-tests.ts +++ b/ftpd/ftpd-tests.ts @@ -29,5 +29,5 @@ server.on('client:connected', function(conn: ftpd.FtpConnection): void { }); }); -server.debugging = ftpd.LogLevel.NOTICE; +server.debugging = ftpd.LogLevel.TRACE; server.listen(21); From 82cf57ccd112defb2e9e50fc294b8bfe58939bbf Mon Sep 17 00:00:00 2001 From: Eric Byers Date: Wed, 7 Dec 2016 15:54:10 -0600 Subject: [PATCH 4/4] Code review changes --- ftpd/index.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ftpd/index.d.ts b/ftpd/index.d.ts index 9f11e76e79..cd325109ee 100644 --- a/ftpd/index.d.ts +++ b/ftpd/index.d.ts @@ -12,7 +12,7 @@ import fs = require("fs"); import net = require("net"); import tls = require("tls"); -export enum LogLevel { +export const enum LogLevel { ERROR = 0, WARN = 1, INFO = 2, @@ -212,5 +212,5 @@ export declare class FtpServer extends events.EventEmitter { /** * Change/Retrieve logLevel at runtime. */ - public debugging:LogLevel; + public debugging: LogLevel; }