Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
caddy
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
caddy
Commits
d76cf6d3
Commit
d76cf6d3
authored
Sep 04, 2015
by
Matt Holt
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #230 from evermax/master
log, errors: Use localtime for the log roller timestamp
parents
d44ab3db
69950e57
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
0 deletions
+4
-0
config/setup/errors_test.go
config/setup/errors_test.go
+2
-0
config/setup/log_test.go
config/setup/log_test.go
+1
-0
config/setup/roller.go
config/setup/roller.go
+1
-0
No files found.
config/setup/errors_test.go
View file @
d76cf6d3
...
@@ -67,6 +67,7 @@ func TestErrorsParse(t *testing.T) {
...
@@ -67,6 +67,7 @@ func TestErrorsParse(t *testing.T) {
MaxSize
:
2
,
MaxSize
:
2
,
MaxAge
:
10
,
MaxAge
:
10
,
MaxBackups
:
3
,
MaxBackups
:
3
,
LocalTime
:
true
,
},
},
}},
}},
{
`errors { log errors.txt {
{
`errors { log errors.txt {
...
@@ -86,6 +87,7 @@ func TestErrorsParse(t *testing.T) {
...
@@ -86,6 +87,7 @@ func TestErrorsParse(t *testing.T) {
MaxSize
:
3
,
MaxSize
:
3
,
MaxAge
:
11
,
MaxAge
:
11
,
MaxBackups
:
5
,
MaxBackups
:
5
,
LocalTime
:
true
,
},
},
}},
}},
}
}
...
...
config/setup/log_test.go
View file @
d76cf6d3
...
@@ -110,6 +110,7 @@ func TestLogParse(t *testing.T) {
...
@@ -110,6 +110,7 @@ func TestLogParse(t *testing.T) {
MaxSize
:
2
,
MaxSize
:
2
,
MaxAge
:
10
,
MaxAge
:
10
,
MaxBackups
:
3
,
MaxBackups
:
3
,
LocalTime
:
true
,
},
},
}}},
}}},
}
}
...
...
config/setup/roller.go
View file @
d76cf6d3
...
@@ -35,5 +35,6 @@ func parseRoller(c *Controller) (*middleware.LogRoller, error) {
...
@@ -35,5 +35,6 @@ func parseRoller(c *Controller) (*middleware.LogRoller, error) {
MaxSize
:
size
,
MaxSize
:
size
,
MaxAge
:
age
,
MaxAge
:
age
,
MaxBackups
:
keep
,
MaxBackups
:
keep
,
LocalTime
:
true
,
},
nil
},
nil
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment