Skip to content
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

Jump to bottom

Log bytecount events on trace level #50

Merged
merged 1 commit into from
Jan 9, 2020
Merged

Log bytecount events on trace level #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 6 additions & 0 deletions openvpn/log/log.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ type Logger interface {
Warn(args ...interface{})
Info(args ...interface{})
Debug(args ...interface{})
Trace(args ...interface{})
}

var logger Logger = stdLogger{}
Expand Down Expand Up @@ -57,3 +58,8 @@ func Info(args ...interface{}) {
func Debug(args ...interface{}) {
logger.Debug(args...)
}

// Trace prints trace message.
func Trace(args ...interface{}) {
logger.Trace(args...)
}
7 changes: 7 additions & 0 deletions openvpn/log/stdlog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,10 @@ func (l stdLogger) Debug(args ...interface{}) {
msg = append(msg, args...)
log.Println(msg...)
}

func (l stdLogger) Trace(args ...interface{}) {
var msg []interface{}
msg = append(msg, "TRACE")
msg = append(msg, args...)
log.Println(msg...)
}
15 changes: 13 additions & 2 deletions openvpn/management/listener.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ func (management *Management) consumeOpenvpnConnectionOutput(input io.Reader, ou
close(eventChannel)
return
}
log.Debug(management.logPrefix, "Line received:", line)
management.logEvent("Line received:", line)

output := outputChannel
if strings.HasPrefix(line, ">") {
Expand All @@ -219,7 +219,7 @@ func (management *Management) consumeOpenvpnConnectionOutput(input io.Reader, ou

func (management *Management) deliverOpenvpnManagementEvents(eventChannel chan string) {
for event := range eventChannel {
log.Debug(management.logPrefix, "Line delivering:", event)
management.logEvent("Line delivering:", event)

lineConsumed := false
for _, middleware := range management.middlewares {
Expand All @@ -236,3 +236,14 @@ func (management *Management) deliverOpenvpnManagementEvents(eventChannel chan s
}
log.Info(management.logPrefix, "Event consumer is done")
}

// Change this to slice as needed
var traceLevelEvents = ">BYTECOUNT"

func (management *Management) logEvent(msg, event string) {
if strings.HasPrefix(event, traceLevelEvents) {
log.Trace(management.logPrefix, msg, event)
} else {
log.Debug(management.logPrefix, msg, event)
}
}