Improve openvpn logging
- Show Initialization Sequence completed in green - Show all other openvpn logs in the openvpn color
This commit is contained in:
@@ -5,6 +5,7 @@ import (
|
|||||||
"regexp"
|
"regexp"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
|
"github.com/fatih/color"
|
||||||
"github.com/qdm12/golibs/logging"
|
"github.com/qdm12/golibs/logging"
|
||||||
"github.com/qdm12/private-internet-access-docker/internal/constants"
|
"github.com/qdm12/private-internet-access-docker/internal/constants"
|
||||||
)
|
)
|
||||||
@@ -38,18 +39,23 @@ func PostProcessLine(s string) (filtered string, level logging.Level) {
|
|||||||
case strings.HasPrefix(s, "openvpn: NOTE: "):
|
case strings.HasPrefix(s, "openvpn: NOTE: "):
|
||||||
filtered = strings.TrimPrefix(s, "openvpn: NOTE: ")
|
filtered = strings.TrimPrefix(s, "openvpn: NOTE: ")
|
||||||
filtered = "openvpn: " + filtered
|
filtered = "openvpn: " + filtered
|
||||||
return filtered, logging.InfoLevel
|
level = logging.InfoLevel
|
||||||
case strings.HasPrefix(s, "openvpn: WARNING: "):
|
case strings.HasPrefix(s, "openvpn: WARNING: "):
|
||||||
filtered = strings.TrimPrefix(s, "openvpn: WARNING: ")
|
filtered = strings.TrimPrefix(s, "openvpn: WARNING: ")
|
||||||
filtered = "openvpn: " + filtered
|
filtered = "openvpn: " + filtered
|
||||||
return filtered, logging.WarnLevel
|
level = logging.WarnLevel
|
||||||
case strings.HasPrefix(s, "openvpn: Options error: "):
|
case strings.HasPrefix(s, "openvpn: Options error: "):
|
||||||
filtered = strings.TrimPrefix(s, "openvpn: Options error: ")
|
filtered = strings.TrimPrefix(s, "openvpn: Options error: ")
|
||||||
filtered = "openvpn: " + filtered
|
filtered = "openvpn: " + filtered
|
||||||
return filtered, logging.ErrorLevel
|
level = logging.ErrorLevel
|
||||||
|
case s == "openvpn: Initialization Sequence Completed":
|
||||||
|
return color.HiGreenString(s), logging.InfoLevel
|
||||||
|
default:
|
||||||
|
filtered = s
|
||||||
|
level = logging.InfoLevel
|
||||||
}
|
}
|
||||||
filtered = constants.ColorOpenvpn().Sprintf(s)
|
filtered = constants.ColorOpenvpn().Sprintf(filtered)
|
||||||
return filtered, logging.InfoLevel
|
return filtered, level
|
||||||
case strings.HasPrefix(s, "unbound: "):
|
case strings.HasPrefix(s, "unbound: "):
|
||||||
prefix := regularExpressions.unboundPrefix.FindString(s)
|
prefix := regularExpressions.unboundPrefix.FindString(s)
|
||||||
filtered = s[len(prefix):]
|
filtered = s[len(prefix):]
|
||||||
|
|||||||
@@ -100,6 +100,10 @@ func Test_PostProcessLine(t *testing.T) {
|
|||||||
"openvpn: NOTE: UID/GID downgrade will be delayed because of --client, --pull, or --up-delay",
|
"openvpn: NOTE: UID/GID downgrade will be delayed because of --client, --pull, or --up-delay",
|
||||||
"",
|
"",
|
||||||
""},
|
""},
|
||||||
|
"openvpn success": {
|
||||||
|
"openvpn: Initialization Sequence Completed",
|
||||||
|
"openvpn: Initialization Sequence Completed",
|
||||||
|
logging.InfoLevel},
|
||||||
}
|
}
|
||||||
for name, tc := range tests {
|
for name, tc := range tests {
|
||||||
tc := tc
|
tc := tc
|
||||||
|
|||||||
Reference in New Issue
Block a user