Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
Acme.Sh
Commits
e02bede4
Commit
e02bede4
authored
Feb 19, 2017
by
neil
Committed by
GitHub
Feb 19, 2017
Browse files
Merge pull request #639 from Neilpang/dev
fix syslog level
parents
dca163f5
113089be
Changes
1
Show whitespace changes
Inline
Side-by-side
acme.sh
View file @
e02bede4
...
@@ -76,17 +76,17 @@ SYSLOG_INFO="user.info"
...
@@ -76,17 +76,17 @@ SYSLOG_INFO="user.info"
SYSLOG_DEBUG
=
"user.debug"
SYSLOG_DEBUG
=
"user.debug"
#error
#error
SYSLOG_LEVEL_
1
=
1
SYSLOG_LEVEL_
ERROR
=
3
#info
#info
SYSLOG_LEVEL_
2
=
2
SYSLOG_LEVEL_
INFO
=
6
#debug
#debug
SYSLOG_LEVEL_
3
=
3
SYSLOG_LEVEL_
DEBUG
=
7
#debug2
#debug2
SYSLOG_LEVEL_
4
=
4
SYSLOG_LEVEL_
DEBUG_2
=
8
#debug3
#debug3
SYSLOG_LEVEL_
5
=
5
SYSLOG_LEVEL_
DEBUG_3
=
9
SYSLOG_LEVEL_DEFAULT
=
$SYSLOG_LEVEL_
1
SYSLOG_LEVEL_DEFAULT
=
$SYSLOG_LEVEL_
ERROR
#none
#none
SYSLOG_LEVEL_NONE
=
0
SYSLOG_LEVEL_NONE
=
0
...
@@ -174,7 +174,7 @@ _log() {
...
@@ -174,7 +174,7 @@ _log() {
_info
()
{
_info
()
{
_log
"
$@
"
_log
"
$@
"
if
[
"
${
SYS_LOG
:-
$SYSLOG_LEVEL_NONE
}
"
-ge
"
$SYSLOG_LEVEL_
2
"
]
;
then
if
[
"
${
SYS_LOG
:-
$SYSLOG_LEVEL_NONE
}
"
-ge
"
$SYSLOG_LEVEL_
INFO
"
]
;
then
_syslog
"
$SYSLOG_INFO
"
"
$@
"
_syslog
"
$SYSLOG_INFO
"
"
$@
"
fi
fi
_printargs
"
$@
"
_printargs
"
$@
"
...
@@ -204,7 +204,7 @@ _debug() {
...
@@ -204,7 +204,7 @@ _debug() {
if
[
"
${
LOG_LEVEL
:-
$DEFAULT_LOG_LEVEL
}
"
-ge
"
$LOG_LEVEL_1
"
]
;
then
if
[
"
${
LOG_LEVEL
:-
$DEFAULT_LOG_LEVEL
}
"
-ge
"
$LOG_LEVEL_1
"
]
;
then
_log
"
$@
"
_log
"
$@
"
fi
fi
if
[
"
${
SYS_LOG
:-
$SYSLOG_LEVEL_NONE
}
"
-ge
"
$SYSLOG_LEVEL_
3
"
]
;
then
if
[
"
${
SYS_LOG
:-
$SYSLOG_LEVEL_NONE
}
"
-ge
"
$SYSLOG_LEVEL_
DEBUG
"
]
;
then
_syslog
"
$SYSLOG_DEBUG
"
"
$@
"
_syslog
"
$SYSLOG_DEBUG
"
"
$@
"
fi
fi
if
[
"
${
DEBUG
:-
$DEBUG_LEVEL_NONE
}
"
-ge
"
$DEBUG_LEVEL_1
"
]
;
then
if
[
"
${
DEBUG
:-
$DEBUG_LEVEL_NONE
}
"
-ge
"
$DEBUG_LEVEL_1
"
]
;
then
...
@@ -216,7 +216,7 @@ _debug2() {
...
@@ -216,7 +216,7 @@ _debug2() {
if
[
"
${
LOG_LEVEL
:-
$DEFAULT_LOG_LEVEL
}
"
-ge
"
$LOG_LEVEL_2
"
]
;
then
if
[
"
${
LOG_LEVEL
:-
$DEFAULT_LOG_LEVEL
}
"
-ge
"
$LOG_LEVEL_2
"
]
;
then
_log
"
$@
"
_log
"
$@
"
fi
fi
if
[
"
${
SYS_LOG
:-
$SYSLOG_LEVEL_NONE
}
"
-ge
"
$SYSLOG_LEVEL_
4
"
]
;
then
if
[
"
${
SYS_LOG
:-
$SYSLOG_LEVEL_NONE
}
"
-ge
"
$SYSLOG_LEVEL_
DEBUG_2
"
]
;
then
_syslog
"
$SYSLOG_DEBUG
"
"
$@
"
_syslog
"
$SYSLOG_DEBUG
"
"
$@
"
fi
fi
if
[
"
${
DEBUG
:-
$DEBUG_LEVEL_NONE
}
"
-ge
"
$DEBUG_LEVEL_2
"
]
;
then
if
[
"
${
DEBUG
:-
$DEBUG_LEVEL_NONE
}
"
-ge
"
$DEBUG_LEVEL_2
"
]
;
then
...
@@ -228,7 +228,7 @@ _debug3() {
...
@@ -228,7 +228,7 @@ _debug3() {
if
[
"
${
LOG_LEVEL
:-
$DEFAULT_LOG_LEVEL
}
"
-ge
"
$LOG_LEVEL_3
"
]
;
then
if
[
"
${
LOG_LEVEL
:-
$DEFAULT_LOG_LEVEL
}
"
-ge
"
$LOG_LEVEL_3
"
]
;
then
_log
"
$@
"
_log
"
$@
"
fi
fi
if
[
"
${
SYS_LOG
:-
$SYSLOG_LEVEL_NONE
}
"
-ge
"
$SYSLOG_LEVEL_
5
"
]
;
then
if
[
"
${
SYS_LOG
:-
$SYSLOG_LEVEL_NONE
}
"
-ge
"
$SYSLOG_LEVEL_
DEBUG_3
"
]
;
then
_syslog
"
$SYSLOG_DEBUG
"
"
$@
"
_syslog
"
$SYSLOG_DEBUG
"
"
$@
"
fi
fi
if
[
"
${
DEBUG
:-
$DEBUG_LEVEL_NONE
}
"
-ge
"
$DEBUG_LEVEL_3
"
]
;
then
if
[
"
${
DEBUG
:-
$DEBUG_LEVEL_NONE
}
"
-ge
"
$DEBUG_LEVEL_3
"
]
;
then
...
...
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