Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[v0.4.0] Feature/file logger #4

Merged
merged 39 commits into from
Nov 20, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
7aa6487
Installed missing packages.
Nov 17, 2017
dc56932
Added externals libs in webpack config.
Nov 17, 2017
475dd90
WriteMessageHandler type changed to list.
Nov 17, 2017
9a7a81e
Created file message handler.
Nov 17, 2017
620c3ad
Builded code.
Nov 17, 2017
4565cbd
Upated typescript configuration.
Nov 20, 2017
68acf67
Updated webpack configurations.
Nov 20, 2017
566ecd9
Installed tslib and updated build scripts.
Nov 20, 2017
6f6825e
Reexported ConsoleMessageHandler.
Nov 20, 2017
6713355
Exported ConsoleMessageHandler in main module. Removed handlers exports.
Nov 20, 2017
9bf84c8
All imports changed to `simplr-logger`.
Nov 20, 2017
b2a87e1
Updated imports.
Nov 20, 2017
acb2b0a
Updated naming.
Nov 20, 2017
2e42983
Builded code.
Nov 20, 2017
2fd34d3
Updated README.MD
Nov 20, 2017
bef1d2f
Updated readme.
Nov 20, 2017
7637d8e
Updated readme.
Nov 20, 2017
c9be1ba
0.4.0-alpha.1
Nov 20, 2017
25c6a1d
Rebuilded code.
Nov 20, 2017
934960d
Added directories lib.
Nov 20, 2017
26442e3
0.4.0-alpha.2
Nov 20, 2017
34b5571
Added handlers proxy file.
Nov 20, 2017
473ce50
0.4.0-alpha.3
Nov 20, 2017
259434f
Updated tsconfig.
Nov 20, 2017
91e647b
Created copy-handlers script.
Nov 20, 2017
31946f3
Updated scripts to copy handlers.
Nov 20, 2017
752e208
Handlers renamed to logger-handlers and created proxy file.
Nov 20, 2017
0c729ed
Rebuilded code.
Nov 20, 2017
f0682d1
0.4.0-alpha.4
Nov 20, 2017
09dcb56
Updated files list.
Nov 20, 2017
939da8b
0.4.0-alpha.5
Nov 20, 2017
4699779
0.4.0-alpha.6
Nov 20, 2017
600c4ab
Updated keywords.
Nov 20, 2017
680a5e3
Updated readme.
Nov 20, 2017
0646d83
Updated description.
Nov 20, 2017
6607f96
Updated copy-handlers description.
Nov 20, 2017
638809b
Added AddWriteMessageHandler method to configuration builder.
Nov 20, 2017
a7a9911
Added important comment.
Nov 20, 2017
1105315
Updated description.
Nov 20, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion @types/abstractions/message-handler-base.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LogLevel } from "./log-level";
import { LogLevel } from "simplr-logger";
export declare abstract class MessageHandlerBase {
abstract HandleMessage(level: LogLevel, isLevelEnabled: boolean, timestamp: number, messages: any[]): void;
}
3 changes: 1 addition & 2 deletions @types/builders/logger-builder.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { LoggerConfiguration } from "./logger-configuration-builder";
import { LogLevel } from "../abstractions/log-level";
import { LogLevel, LoggerConfiguration } from "simplr-logger";
export declare class LoggerBuilder {
private configuration;
constructor(configuration?: LoggerConfiguration);
Expand Down
22 changes: 19 additions & 3 deletions @types/builders/logger-configuration-builder.d.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import { MessageHandlerBase } from "../abstractions/message-handler-base";
import { LogLevel } from "../abstractions/log-level";
import { LogLevel, MessageHandlerBase } from "simplr-logger";
export interface LoggerConfiguration {
WriteMessageHandler: MessageHandlerBase;
/**
* @deprecated Use WriteMessageHandlers instead.
*/
WriteMessageHandler?: MessageHandlerBase;
WriteMessageHandlers: MessageHandlerBase[];
LogLevel: LogLevel;
CustomLogLevels?: boolean;
Prefix?: string;
Expand All @@ -17,8 +20,21 @@ export declare class LoggerConfigurationBuilder {
* Set custom message handler.
*
* @param handler Log messages handler.
* @deprecated Use AddWriteMessageHandlers instead.
*/
SetWriteMessageHandler(handler: MessageHandlerBase): this;
/**
* Add write message handler.
*
* @param handler Log messages handler.
*/
AddWriteMessageHandler(handlers: MessageHandlerBase): this;
/**
* Add write message handlers.
*
* @param handlers Log messages handlers list.
*/
AddWriteMessageHandlers(handlers: MessageHandlerBase[]): this;
/**
* Set log level.
*
Expand Down
1 change: 0 additions & 1 deletion @types/handlers.d.ts

This file was deleted.

3 changes: 1 addition & 2 deletions @types/handlers/console-message-handler.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { LogLevel } from "../abstractions/log-level";
import { MessageHandlerBase } from "../abstractions/message-handler-base";
import { MessageHandlerBase, LogLevel } from "simplr-logger";
export declare class ConsoleMessageHandler extends MessageHandlerBase {
constructor(configuration?: Partial<ConsoleMessageHandler.Configuration>);
private configuration;
Expand Down
12 changes: 12 additions & 0 deletions @types/handlers/file-message-handler.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { MessageHandlerBase, LogLevel } from "simplr-logger";
export declare class FileMessageHandler extends MessageHandlerBase {
private isServerSide;
constructor(filePathName: string, isServerSide?: boolean | undefined);
private filePathName;
private readonly handleMessageStackCount;
HandleMessage(level: LogLevel, isLevelEnabled: boolean, timestamp: number, messages: any[]): void;
private writeStream;
private getWriteStream();
private readonly EOL;
private ensureDirectory();
}
4 changes: 2 additions & 2 deletions @types/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ export { LoggerBuilder } from "./builders/logger-builder";
export { LoggerConfigurationBuilder, LoggerConfiguration } from "./builders/logger-configuration-builder";
export { LogLevel } from "./abstractions/log-level";
export { MessageHandlerBase } from "./abstractions/message-handler-base";
import * as Handlers from "./handlers";
export { Handlers };
export { ConsoleMessageHandler } from "./handlers/console-message-handler";
export { Helpers as LoggerHelpers } from "./utils/helpers";
2 changes: 2 additions & 0 deletions @types/logger-handlers.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export { ConsoleMessageHandler } from "simplr-logger";
export { FileMessageHandler } from "./handlers/file-message-handler";
2 changes: 1 addition & 1 deletion @types/utils/helpers.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LogLevel } from "../abstractions/log-level";
import { LogLevel } from "simplr-logger";
export declare class HelpersBuilder {
GetLogLevelShortString(level: LogLevel): string;
GetLogLevelString(level: LogLevel): string;
Expand Down
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Simplr Logger

Simple JavaScript logger written in [TypeScript](http://typescriptlang.org).
Simple JavaScript logger written in [TypeScript](http://typescriptlang.org) that can be used in browser or node application.

The package is most useful when used with [TypeScript](http://typescriptlang.org).

Expand All @@ -24,9 +24,11 @@ const logger = new LoggerBuilder();

```ts
import { LoggerBuilder, LoggerConfigurationBuilder, LogLevel } from "simplr-logger";
import { FileMessageHandler, ConsoleMessageHandler } from "simplr-logger/handlers";

const config = new LoggerConfigurationBuilder()
.SetLogLevel(LogLevel.Trace)
.AddWriteMessageHandlers([new ConsoleMessageHandler(), new FileMessageHandler("./logs.txt")])
.Build();

const logger = new LoggerBuilder(config);
Expand All @@ -35,11 +37,11 @@ const logger = new LoggerBuilder(config);
#### With simple object

```ts
import { LoggerBuilder, LoggerConfigurationBuilder, LogLevel, Handlers } from "simplr-logger";
import { LoggerBuilder, LoggerConfigurationBuilder, LogLevel, ConsoleMessageHandler } from "simplr-logger";

const logger = new LoggerBuilder({
LogLevel: LogLevel.Trace,
WriteMessageHandler: new Handlers.ConsoleMessageHandler()
WriteMessageHandlers: [new ConsoleMessageHandler()]
});
```

Expand Down
246 changes: 246 additions & 0 deletions dist/simplr-logger-handlers.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,246 @@
(function webpackUniversalModuleDefinition(root, factory) {
if(typeof exports === 'object' && typeof module === 'object')
module.exports = factory();
else if(typeof define === 'function' && define.amd)
define([], factory);
else {
var a = factory();
for(var i in a) (typeof exports === 'object' ? exports : root)[i] = a[i];
}
})(this, function() {
return /******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
/******/
/******/ // The require function
/******/ function __webpack_require__(moduleId) {
/******/
/******/ // Check if module is in cache
/******/ if(installedModules[moduleId]) {
/******/ return installedModules[moduleId].exports;
/******/ }
/******/ // Create a new module (and put it into the cache)
/******/ var module = installedModules[moduleId] = {
/******/ i: moduleId,
/******/ l: false,
/******/ exports: {}
/******/ };
/******/
/******/ // Execute the module function
/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
/******/
/******/ // Flag the module as loaded
/******/ module.l = true;
/******/
/******/ // Return the exports of the module
/******/ return module.exports;
/******/ }
/******/
/******/
/******/ // expose the modules object (__webpack_modules__)
/******/ __webpack_require__.m = modules;
/******/
/******/ // expose the module cache
/******/ __webpack_require__.c = installedModules;
/******/
/******/ // define getter function for harmony exports
/******/ __webpack_require__.d = function(exports, name, getter) {
/******/ if(!__webpack_require__.o(exports, name)) {
/******/ Object.defineProperty(exports, name, {
/******/ configurable: false,
/******/ enumerable: true,
/******/ get: getter
/******/ });
/******/ }
/******/ };
/******/
/******/ // getDefaultExport function for compatibility with non-harmony modules
/******/ __webpack_require__.n = function(module) {
/******/ var getter = module && module.__esModule ?
/******/ function getDefault() { return module['default']; } :
/******/ function getModuleExports() { return module; };
/******/ __webpack_require__.d(getter, 'a', getter);
/******/ return getter;
/******/ };
/******/
/******/ // Object.prototype.hasOwnProperty.call
/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
/******/
/******/ // __webpack_public_path__
/******/ __webpack_require__.p = "";
/******/
/******/ // Load entry module and return exports
/******/ return __webpack_require__(__webpack_require__.s = 4);
/******/ })
/************************************************************************/
/******/ ([
/* 0 */
/***/ (function(module, exports) {

module.exports = require("tslib");

/***/ }),
/* 1 */
/***/ (function(module, exports) {

module.exports = require("simplr-logger");

/***/ }),
/* 2 */
/***/ (function(module, exports) {

module.exports = require("path");

/***/ }),
/* 3 */
/***/ (function(module, exports) {

module.exports = require("fs");

/***/ }),
/* 4 */
/***/ (function(module, exports, __webpack_require__) {

Object.defineProperty(exports, "__esModule", { value: true });
var tslib_1 = __webpack_require__(0);
tslib_1.__exportStar(__webpack_require__(5), exports);


/***/ }),
/* 5 */
/***/ (function(module, exports, __webpack_require__) {

Object.defineProperty(exports, "__esModule", { value: true });
var simplr_logger_1 = __webpack_require__(1);
exports.ConsoleMessageHandler = simplr_logger_1.ConsoleMessageHandler;
var file_message_handler_1 = __webpack_require__(6);
exports.FileMessageHandler = file_message_handler_1.FileMessageHandler;


/***/ }),
/* 6 */
/***/ (function(module, exports, __webpack_require__) {

Object.defineProperty(exports, "__esModule", { value: true });
var tslib_1 = __webpack_require__(0);
var simplr_logger_1 = __webpack_require__(1);
var FileMessageHandler = /** @class */ (function (_super) {
tslib_1.__extends(FileMessageHandler, _super);
function FileMessageHandler(filePathName, isServerSide) {
var _this = _super.call(this) || this;
_this.isServerSide = isServerSide;
// IMPORTANT: The value must be changed after files structure were updated!
_this.handleMessageStackCount = 4;
if (_this.isServerSide == null) {
try {
// tslint:disable-next-line:no-require-imports no-unused-expression
__webpack_require__(7);
_this.isServerSide = true;
}
catch (_a) {
_this.isServerSide = false;
}
}
if (_this.isServerSide) {
// tslint:disable-next-line:no-require-imports
var normalize = __webpack_require__(2).normalize;
_this.filePathName = normalize(filePathName);
_this.ensureDirectory();
}
return _this;
}
FileMessageHandler.prototype.HandleMessage = function (level, isLevelEnabled, timestamp, messages) {
if (!this.isServerSide) {
return;
}
var writeStream = this.getWriteStream();
var formattedMessages = messages.map(function (msg) {
switch (typeof msg) {
case "string":
return msg;
case "undefined":
case "boolean":
case "number":
case "function":
case "symbol":
return String(msg);
case "object":
if (msg instanceof Error) {
return String(msg.stack);
}
else {
return JSON.stringify(msg);
}
}
});
if (level === simplr_logger_1.LogLevel.Trace) {
var err = new Error();
var stack = String(err.stack);
err = undefined;
var stackString = "\n" + stack.split("\n").slice(this.handleMessageStackCount, stack.length).join("\n");
formattedMessages.push(stackString);
}
var datePrefix = "[" + new Date(timestamp).toLocaleString() + "]";
writeStream.write(datePrefix + " " + simplr_logger_1.LoggerHelpers.GetLogLevelShortString(level) + ": " + formattedMessages.join(" ") + this.EOL);
};
FileMessageHandler.prototype.getWriteStream = function () {
var _this = this;
if (this.writeStream != null) {
return this.writeStream;
}
// tslint:disable-next-line:no-require-imports
var fs = __webpack_require__(3);
this.writeStream = fs.createWriteStream(this.filePathName, { flags: "a" });
this.writeStream.on("close", function () {
_this.writeStream = undefined;
});
this.writeStream.on("error", function (err) {
throw err;
});
return this.writeStream;
};
Object.defineProperty(FileMessageHandler.prototype, "EOL", {
get: function () {
// tslint:disable-next-line:no-require-imports
var EOL = __webpack_require__(8).EOL;
return EOL;
},
enumerable: true,
configurable: true
});
FileMessageHandler.prototype.ensureDirectory = function () {
// tslint:disable-next-line:no-require-imports
var path = __webpack_require__(2);
// tslint:disable-next-line:no-require-imports
var fs = __webpack_require__(3);
var dir = path.dirname(this.filePathName);
var dirList = dir.split(path.sep);
var targetDir = (dir[0] !== path.sep && path.isAbsolute(dir)) ? "" : process.cwd();
for (var _i = 0, dirList_1 = dirList; _i < dirList_1.length; _i++) {
var a = dirList_1[_i];
targetDir = path.join(targetDir, a);
if (a.length > 0 && !fs.existsSync(targetDir)) {
fs.mkdirSync(targetDir);
}
}
};
return FileMessageHandler;
}(simplr_logger_1.MessageHandlerBase));
exports.FileMessageHandler = FileMessageHandler;


/***/ }),
/* 7 */
/***/ (function(module, exports) {

module.exports = require("process");

/***/ }),
/* 8 */
/***/ (function(module, exports) {

module.exports = require("os");

/***/ })
/******/ ]);
});
1 change: 1 addition & 0 deletions dist/simplr-logger-handlers.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading