Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
goSDN
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
danet
goSDN
Commits
7ae39e18
Commit
7ae39e18
authored
4 years ago
by
Manuel Kieweg
Browse files
Options
Downloads
Patches
Plain Diff
logging to syslog. main contains syslog example
parent
3bd39af9
No related branches found
No related tags found
2 merge requests
!41
Resolve "Enhanced Logging"
,
!18
Develop
Pipeline
#52502
passed with warnings
4 years ago
Stage: test
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
log/logger.go
+12
-3
12 additions, 3 deletions
log/logger.go
main.go
+1
-1
1 addition, 1 deletion
main.go
with
13 additions
and
4 deletions
log/logger.go
+
12
−
3
View file @
7ae39e18
...
@@ -3,7 +3,9 @@ package log
...
@@ -3,7 +3,9 @@ package log
import
(
import
(
"fmt"
"fmt"
"io"
"io"
"log/syslog"
"os"
"os"
"reflect"
"runtime"
"runtime"
"strconv"
"strconv"
"strings"
"strings"
...
@@ -19,13 +21,16 @@ var once sync.Once
...
@@ -19,13 +21,16 @@ var once sync.Once
type
Logger
struct
{
type
Logger
struct
{
DefaultWriter
io
.
Writer
DefaultWriter
io
.
Writer
LoglevelWriter
map
[
Level
]
io
.
Writer
LoglevelWriter
map
[
Level
]
io
.
Writer
toSyslog
map
[
Level
]
bool
Loglevel
Level
Loglevel
Level
lock
sync
.
Mutex
lock
sync
.
Mutex
builder
strings
.
Builder
builder
strings
.
Builder
}
}
func
(
l
*
Logger
)
buildMessage
(
level
Level
,
args
...
interface
{})
{
func
(
l
*
Logger
)
buildMessage
(
level
Level
,
syslog
bool
,
args
...
interface
{})
{
l
.
builder
.
WriteString
(
time
.
Now
()
.
Format
(
time
.
RFC3339
))
if
!
syslog
{
l
.
builder
.
WriteString
(
time
.
Now
()
.
Format
(
time
.
RFC3339
))
}
l
.
builder
.
WriteRune
(
'\t'
)
l
.
builder
.
WriteRune
(
'\t'
)
l
.
builder
.
WriteString
(
prefix
(
level
))
l
.
builder
.
WriteString
(
prefix
(
level
))
l
.
builder
.
WriteRune
(
'\t'
)
l
.
builder
.
WriteRune
(
'\t'
)
...
@@ -45,6 +50,7 @@ func get() *Logger {
...
@@ -45,6 +50,7 @@ func get() *Logger {
logger
=
&
Logger
{
logger
=
&
Logger
{
DefaultWriter
:
os
.
Stderr
,
DefaultWriter
:
os
.
Stderr
,
LoglevelWriter
:
make
(
map
[
Level
]
io
.
Writer
),
LoglevelWriter
:
make
(
map
[
Level
]
io
.
Writer
),
toSyslog
:
make
(
map
[
Level
]
bool
),
Loglevel
:
INFO
,
Loglevel
:
INFO
,
lock
:
sync
.
Mutex
{},
lock
:
sync
.
Mutex
{},
}
}
...
@@ -77,6 +83,9 @@ func LoglevelOutput(level Level, out io.Writer) {
...
@@ -77,6 +83,9 @@ func LoglevelOutput(level Level, out io.Writer) {
l
.
lock
.
Lock
()
l
.
lock
.
Lock
()
defer
l
.
lock
.
Unlock
()
defer
l
.
lock
.
Unlock
()
l
.
LoglevelWriter
[
level
]
=
out
l
.
LoglevelWriter
[
level
]
=
out
if
reflect
.
TypeOf
(
out
)
==
reflect
.
TypeOf
(
&
syslog
.
Writer
{})
{
l
.
toSyslog
[
level
]
=
true
}
}
}
//Debug passes the DEBUG flag and a
//Debug passes the DEBUG flag and a
...
@@ -130,7 +139,7 @@ func log(level Level, args ...interface{}) {
...
@@ -130,7 +139,7 @@ func log(level Level, args ...interface{}) {
defer
l
.
lock
.
Unlock
()
defer
l
.
lock
.
Unlock
()
defer
l
.
builder
.
Reset
()
defer
l
.
builder
.
Reset
()
if
level
<=
l
.
Loglevel
{
if
level
<=
l
.
Loglevel
{
l
.
buildMessage
(
level
,
args
...
)
l
.
buildMessage
(
level
,
l
.
toSyslog
[
level
],
args
...
)
msg
:=
[]
byte
(
l
.
builder
.
String
())
msg
:=
[]
byte
(
l
.
builder
.
String
())
writer
,
ok
:=
l
.
LoglevelWriter
[
level
]
writer
,
ok
:=
l
.
LoglevelWriter
[
level
]
var
err
error
var
err
error
...
...
This diff is collapsed.
Click to expand it.
main.go
+
1
−
1
View file @
7ae39e18
...
@@ -18,7 +18,7 @@ func main() {
...
@@ -18,7 +18,7 @@ func main() {
cliSocket
:=
*
cliListenAddr
+
":"
+
*
cliListenPort
cliSocket
:=
*
cliListenAddr
+
":"
+
*
cliListenPort
log
.
Loglevel
(
log
.
DEBUG
)
log
.
Loglevel
(
log
.
DEBUG
)
syslogWriter
,
err
:=
syslog
.
New
(
syslog
.
LOG_INFO
|
syslog
.
LOG_ALERT
,
"gosdn"
)
syslogWriter
,
err
:=
syslog
.
New
(
syslog
.
LOG_ALERT
,
"gosdn"
)
defer
func
()
{
defer
func
()
{
if
err
:=
syslogWriter
.
Close
();
err
!=
nil
{
if
err
:=
syslogWriter
.
Close
();
err
!=
nil
{
log
.
Fatal
(
err
)
log
.
Fatal
(
err
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment