Skip to content

feat(logger): fix logger rotation #557

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Feb 22, 2019
Merged

feat(logger): fix logger rotation #557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 9 additions & 8 deletions src/cli/base-cli-handler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ const AppHelper = require('../helpers/app-helper');
const Errors = require('../helpers/errors');
const ErrorMessages = require('../helpers/error-messages');
const constants = require('../helpers/constants');
const logger = require('../logger')

class CLIHandler {
constructor() {
Expand Down Expand Up @@ -66,7 +67,7 @@ class CLIHandler {
content: 'Fog Controller project for Eclipse IoFog @ iofog.org \\nCopyright (c) 2018 Edgeworx, Inc.',
}
].concat(sections);
console.log(commandLineUsage(usage))
logger.cliRes(commandLineUsage(usage))
}

helpAll(show = [], showOptions = true, hasCommands = true, additionalSection = []) {
Expand Down Expand Up @@ -99,36 +100,36 @@ class CLIHandler {
content: 'Fog Controller project for Eclipse IoFog @ iofog.org \\nCopyright (c) 2018 Edgeworx, Inc.',
}
].concat(sections);
console.log(commandLineUsage(usage))
logger.cliRes(commandLineUsage(usage))
}

handleCLIError(error, args) {
switch (error.name) {
case "UNKNOWN_OPTION":
console.log("Invalid argument '" + error.optionName.split('-').join('') + "'");
logger.error("Invalid argument '" + error.optionName.split('-').join('') + "'");
break;
case "UNKNOWN_VALUE":
if (this.commands[args[0]] && args[1] === 'help') {
return this.helpSome([args[0]]);
}
console.log("Invalid value " + error.value);
logger.error("Invalid value " + error.value);
break;
case "InvalidArgumentError":
console.log(error.message);
logger.error(error.message);
break;
case "InvalidArgumentTypeError":
console.log(error.message);
logger.error(error.message);
break;
case "ALREADY_SET":
console.log("Parameter '" + error.optionName + "' is used multiple times");
logger.error("Parameter '" + error.optionName + "' is used multiple times");
break;
case 'CLIArgsNotProvidedError':
if (this.commands[args[0]]) {
return this.helpSome([args[0]]);
}
break;
default:
console.log(JSON.stringify(error));
logger.error(JSON.stringify(error));
break;
}
}
Expand Down
12 changes: 10 additions & 2 deletions src/logger/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ const fs = require('fs');
const MESSAGE = Symbol.for('message');

const dirname = config.get('Service:LogsDirectory')
const maxsize = config.get('Service:LogsFileSize')

// Create the log directory if it does not exist
try {
Expand Down Expand Up @@ -80,7 +81,7 @@ const logger = winston.createLogger({
),
filename: 'iofog-controller.0.log',
dirname: dirname,
maxsize: config.get('Service:LogsFileSize'),
maxsize: maxsize,
rotationFormat: function() {
return getFormattedLogName();
}
Expand All @@ -91,7 +92,14 @@ const logger = winston.createLogger({
// logFileName pattern similar to agent
function getFormattedLogName() {
if (fs.existsSync(dirname)) {
fs.readdirSync(dirname).reverse().forEach(file => {
const files = fs.readdirSync(dirname)
const latestFilePath = dirname + '/' + files[0]

if (files.length === 0 || fs.statSync(latestFilePath).size <= maxsize) {
return ''
}

files.reverse().forEach(file => {
const path = dirname + '/' + file
if (fs.existsSync(path)) {
const strNumber = file.replace('iofog-controller.', '').replace('.log', '')
Expand Down