Skip to content

Commit

Permalink
Merge pull request #4 from anigenero/1.0.x
Browse files Browse the repository at this point in the history
1.0.0 Release Merge
  • Loading branch information
anigenero authored Nov 3, 2016
2 parents 5a1ca48 + e3ba351 commit e366b6b
Show file tree
Hide file tree
Showing 45 changed files with 1,624 additions and 777 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ var log4js = require('log4js2');
Or, for HTML implementations, place the log4js distribution in your HTML ```<head>``` tag.

```html
<script type="text/javascript" src="log4js2.min.js"></script>
<script type="text/javascript" src="dist/log4js2.es5.min.js"></script>
```

Then, log some stuff!!
Expand All @@ -59,7 +59,7 @@ the first log you commit will not allow updates from this function

```javascript
log4js.configure({
layout : '%d{MM-dd-yyyy HH:mm:ss,S}|%logger:%M:%line|%message',
layout : '%d{DEFAULT} [%level] %logger %M:%line - %message',
appenders : [ 'consoleAppender' ],
loggers : [ {
logLevel : log4js.LogLevel.INFO
Expand Down Expand Up @@ -112,7 +112,7 @@ debugLog.debug('This message will show');

#### layout
Type: `String`
Default: `"%d{HH:mm:ss} [%level] %logger - %message"`
Default: `"%d [%p] %c - %m"`

Sets the tagging layout for the logs. Refer to
[Apache's Log4j2 documentation](https://logging.apache.org/log4j/2.x/manual/layouts.html) for how
Expand Down
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "log4js2",
"version": "0.1.2",
"version": "1.0.0-beta1",
"homepage": "https://github.com/anigenero/log4js2",
"authors": [
"Robin Schultz <developer@cunae.com>"
"Robin Schultz <robin@anigenero.com>"
],
"description": "A fast JavaScript logger with no runtime dependencies that is designed to mirror Apache Log4j 2 functionality",
"main": "dist/log4js2.min.js",
Expand Down
44 changes: 34 additions & 10 deletions dist/es5/appender/appender.js

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

4 changes: 2 additions & 2 deletions dist/es5/appender/consoleAppender.js

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

Loading

0 comments on commit e366b6b

Please sign in to comment.