Skip to content

Added milliseconds to timestamp, updated 'pad' function #42

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 2 commits into from
Oct 5, 2015
Merged

Added milliseconds to timestamp, updated 'pad' function #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e68e915
Added milliseconds to timestamp, updated 'pad' function
grushetsky Oct 5, 2015
67ef7c2
Updated dependencies of 'redux-logger-example'
grushetsky Oct 5, 2015
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
6 changes: 3 additions & 3 deletions dist/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ return /******/ (function(modules) { // webpackBootstrap
Object.defineProperty(exports, "__esModule", {
value: true
});
var pad = function pad(num) {
return ("0" + num).slice(-2);
var pad = function pad(num, maxLength) {
return "0".repeat(maxLength - num.toString().length) + num;
};

// Use the new performance api to get better precision if available
Expand Down Expand Up @@ -137,7 +137,7 @@ return /******/ (function(modules) { // webpackBootstrap
var time = new Date();
var isCollapsed = typeof collapsed === "function" ? collapsed(getState, action) : collapsed;

var formattedTime = timestamp ? " @ " + time.getHours() + ":" + pad(time.getMinutes()) + ":" + pad(time.getSeconds()) : "";
var formattedTime = timestamp ? " @ " + pad(time.getHours(), 2) + ":" + pad(time.getMinutes(), 2) + ":" + pad(time.getSeconds(), 2) + "." + pad(time.getMilliseconds(), 3) : "";
var formattedDuration = duration ? " in " + took.toFixed(2) + " ms" : "";
var formattedAction = actionTransformer(action);
var message = "action " + formattedAction.type + formattedTime + formattedDuration;
Expand Down
2 changes: 1 addition & 1 deletion dist/index.min.js
View file
Open in desktop

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

12 changes: 6 additions & 6 deletions examples/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,22 @@
"homepage": "https://github.com/fcomb/redux-logger",
"dependencies": {
"react": "^0.13.3",
"redux": "3.0.0",
"react-redux": "^3.0.0",
"redux": "3.0.2",
"react-redux": "^3.1.0",
"redux-actions": "^0.8.0"
},
"devDependencies": {
"babel-core": "^5.8.25",
"babel-loader": "^5.3.2",
"babel-plugin-react-transform": "^1.1.0",
"babel-plugin-react-transform": "^1.1.1",
"css-loader": "^0.19.0",
"express": "^4.13.3",
"node-sass": "^3.3.3",
"react-transform-hmr": "^1.0.0",
"sass-loader": "^2.0.1",
"react-transform-hmr": "^1.0.1",
"sass-loader": "^3.0.0",
"style-loader": "^0.12.4",
"webpack": "^1.12.2",
"webpack-dev-middleware": "^1.2.0",
"webpack-hot-middleware": "^2.2.0"
"webpack-hot-middleware": "^2.4.1"
}
}
6 changes: 3 additions & 3 deletions lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
Object.defineProperty(exports, "__esModule", {
value: true
});
var pad = function pad(num) {
return ("0" + num).slice(-2);
var pad = function pad(num, maxLength) {
return "0".repeat(maxLength - num.toString().length) + num;
};

// Use the new performance api to get better precision if available
Expand Down Expand Up @@ -73,7 +73,7 @@ function createLogger() {
var time = new Date();
var isCollapsed = typeof collapsed === "function" ? collapsed(getState, action) : collapsed;

var formattedTime = timestamp ? " @ " + time.getHours() + ":" + pad(time.getMinutes()) + ":" + pad(time.getSeconds()) : "";
var formattedTime = timestamp ? " @ " + pad(time.getHours(), 2) + ":" + pad(time.getMinutes(), 2) + ":" + pad(time.getSeconds(), 2) + "." + pad(time.getMilliseconds(), 3) : "";
var formattedDuration = duration ? " in " + took.toFixed(2) + " ms" : "";
var formattedAction = actionTransformer(action);
var message = "action " + formattedAction.type + formattedTime + formattedDuration;
Expand Down
4 changes: 2 additions & 2 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const pad = num => (`0` + num).slice(-2);
const pad = (num, maxLength) => `0`.repeat(maxLength - num.toString().length) + num;

// Use the new performance api to get better precision if available
const timer = typeof performance !== `undefined` && typeof performance.now === `function` ? performance : Date;
Expand Down Expand Up @@ -55,7 +55,7 @@ function createLogger(options = {}) {
const time = new Date();
const isCollapsed = (typeof collapsed === `function`) ? collapsed(getState, action) : collapsed;

const formattedTime = timestamp ? ` @ ${time.getHours()}:${pad(time.getMinutes())}:${pad(time.getSeconds())}` : ``;
const formattedTime = timestamp ? ` @ ${pad(time.getHours(), 2)}:${pad(time.getMinutes(), 2)}:${pad(time.getSeconds(), 2)}.${pad(time.getMilliseconds(), 3)}` : ``;
const formattedDuration = duration ? ` in ${took.toFixed(2)} ms` : ``;
const formattedAction = actionTransformer(action);
const message = `action ${formattedAction.type}${formattedTime}${formattedDuration}`;
Expand Down