Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c110403a0d | |||
| b913d49317 | |||
| 8b23731451 | |||
| 86723f24ca | |||
| a52fb3c43d | |||
| ef2dd31219 | |||
| 12b4086bde | |||
| 4aa0beb795 |
@@ -23,9 +23,30 @@ Usage of nmdc-log-service:
|
|||||||
-Password string
|
-Password string
|
||||||
Registered nick password
|
Registered nick password
|
||||||
-Server string
|
-Server string
|
||||||
Addresses to connect to (comma-separated)`
|
Addresses to connect to (comma-separated)
|
||||||
|
-VerifyTLS
|
||||||
|
Verify TLS certificates (default true)
|
||||||
|
`
|
||||||
|
|
||||||
=CHANGELOG=
|
=CHANGELOG=
|
||||||
|
|
||||||
|
2016-04-16 1.0.4
|
||||||
|
- Enhancement: Upgrade `libnmdc` from `r5` to `r6`
|
||||||
|
- Include a sample systemd unit script in source archive
|
||||||
|
- Fix an issue showing zero connected hubs in user tag
|
||||||
|
- Fix a cosmetic issue with logging repeated identical connection failure messages
|
||||||
|
|
||||||
|
2016-04-04 1.0.3
|
||||||
|
- Enhancement: Upgrade `libnmdc` from `r4` to `r5`
|
||||||
|
|
||||||
|
2016-04-03 1.0.2
|
||||||
|
- Enhancement: Upgrade `libnmdc` from `r3` to `r4`
|
||||||
|
|
||||||
|
2016-04-03 1.0.1
|
||||||
|
- Enhancement: Add `-VerifyTLS` option
|
||||||
|
- Enhancement: Upgrade `libnmdc` from `r2` to `r3`
|
||||||
|
- Fix an issue writing log files on Linux
|
||||||
|
- Fix a cosmetic issue with error message formatting
|
||||||
|
|
||||||
2016-04-02 1.0.0
|
2016-04-02 1.0.0
|
||||||
- Initial public release
|
- Initial public release
|
||||||
|
|||||||
10
build.sh
10
build.sh
@@ -7,6 +7,12 @@ export GOPATH=$(
|
|||||||
cygpath -w "$(pwd)"
|
cygpath -w "$(pwd)"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
sanitise() {
|
||||||
|
local tmp=$(mktemp)
|
||||||
|
cat "$1" | perl -pe 's~C:.Users.......Documents.DEV.~C:/xxxxxxxxxxxxxxxxxxxxxxxxx/~g' > "$tmp"
|
||||||
|
mv "$tmp" "$1"
|
||||||
|
}
|
||||||
|
|
||||||
main() {
|
main() {
|
||||||
|
|
||||||
local version=""
|
local version=""
|
||||||
@@ -25,21 +31,25 @@ main() {
|
|||||||
|
|
||||||
echo "Building win64..."
|
echo "Building win64..."
|
||||||
GOARCH=amd64 GOOS=windows go build -a -ldflags -s -o nmdc-log-service.exe
|
GOARCH=amd64 GOOS=windows go build -a -ldflags -s -o nmdc-log-service.exe
|
||||||
|
sanitise nmdc-log-service.exe
|
||||||
7z a -mx9 nmdc-log-service-${version}-win64.7z nmdc-log-service.exe >/dev/null
|
7z a -mx9 nmdc-log-service-${version}-win64.7z nmdc-log-service.exe >/dev/null
|
||||||
rm ./nmdc-log-service.exe
|
rm ./nmdc-log-service.exe
|
||||||
|
|
||||||
echo "Building win32..."
|
echo "Building win32..."
|
||||||
GOARCH=386 GOOS=windows go build -a -ldflags -s -o nmdc-log-service.exe
|
GOARCH=386 GOOS=windows go build -a -ldflags -s -o nmdc-log-service.exe
|
||||||
|
sanitise nmdc-log-service.exe
|
||||||
7z a -mx9 nmdc-log-service-${version}-win32.7z nmdc-log-service.exe >/dev/null
|
7z a -mx9 nmdc-log-service-${version}-win32.7z nmdc-log-service.exe >/dev/null
|
||||||
rm ./nmdc-log-service.exe
|
rm ./nmdc-log-service.exe
|
||||||
|
|
||||||
echo "Building linux64..."
|
echo "Building linux64..."
|
||||||
GOARCH=amd64 GOOS=linux go build -a -ldflags -s -o nmdc-log-service
|
GOARCH=amd64 GOOS=linux go build -a -ldflags -s -o nmdc-log-service
|
||||||
|
sanitise nmdc-log-service
|
||||||
XZ_OPT=-9 tar caf nmdc-log-service-${version}-linux64.tar.xz nmdc-log-service --owner=0 --group=0
|
XZ_OPT=-9 tar caf nmdc-log-service-${version}-linux64.tar.xz nmdc-log-service --owner=0 --group=0
|
||||||
rm ./nmdc-log-service
|
rm ./nmdc-log-service
|
||||||
|
|
||||||
echo "Building linux32..."
|
echo "Building linux32..."
|
||||||
GOARCH=386 GOOS=linux go build -a -ldflags -s -o nmdc-log-service
|
GOARCH=386 GOOS=linux go build -a -ldflags -s -o nmdc-log-service
|
||||||
|
sanitise nmdc-log-service
|
||||||
XZ_OPT=-9 tar caf nmdc-log-service-${version}-linux32.tar.xz nmdc-log-service --owner=0 --group=0
|
XZ_OPT=-9 tar caf nmdc-log-service-${version}-linux32.tar.xz nmdc-log-service --owner=0 --group=0
|
||||||
rm ./nmdc-log-service
|
rm ./nmdc-log-service
|
||||||
|
|
||||||
|
|||||||
14
hublog.service
Normal file
14
hublog.service
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=NMDC Log Service
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Environment=TZ=Etc/UTC
|
||||||
|
Type=simple
|
||||||
|
ExecStart=/home/hublog/nmdc-log-service -Dir /home/hublog/logs/ -Server ... -Nick ... -Password '...' -VerifyTLS=false
|
||||||
|
Restart=always
|
||||||
|
RestartSec=30s
|
||||||
|
User=hublog
|
||||||
|
Group=nogroup
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
22
main.go
22
main.go
@@ -51,12 +51,16 @@ func LogMessage(hub, message string) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func HubWorker(addr, nick, password string) {
|
type HubWorker struct {
|
||||||
|
LastConnectionStateMessage string
|
||||||
|
}
|
||||||
|
|
||||||
|
func (this *HubWorker) MainLoop(addr, nick, password string) {
|
||||||
|
|
||||||
opts := libnmdc.HubConnectionOptions{
|
opts := libnmdc.HubConnectionOptions{
|
||||||
Address: libnmdc.HubAddress(addr),
|
Address: libnmdc.HubAddress(addr),
|
||||||
SkipVerifyTLS: !VerifyTLS,
|
SkipVerifyTLS: !VerifyTLS,
|
||||||
Self: libnmdc.UserInfo{Nick: nick},
|
Self: *libnmdc.NewUserInfo(nick),
|
||||||
NickPassword: password,
|
NickPassword: password,
|
||||||
}
|
}
|
||||||
hub := opts.Connect()
|
hub := opts.Connect()
|
||||||
@@ -71,11 +75,16 @@ func HubWorker(addr, nick, password string) {
|
|||||||
switch event.EventType {
|
switch event.EventType {
|
||||||
case libnmdc.EVENT_CONNECTION_STATE_CHANGED:
|
case libnmdc.EVENT_CONNECTION_STATE_CHANGED:
|
||||||
if LogConnectionState {
|
if LogConnectionState {
|
||||||
|
str := "* " + event.StateChange.Format()
|
||||||
if len(event.Message) > 0 {
|
if len(event.Message) > 0 {
|
||||||
LogMessage(addr, "* "+event.StateChange.Format()+" ("+event.Message+")")
|
str += " (" + event.Message + ")"
|
||||||
} else {
|
|
||||||
LogMessage(addr, "* "+event.StateChange.Format())
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Prevent logging the same message repeatedly
|
||||||
|
if str != this.LastConnectionStateMessage {
|
||||||
|
LogMessage(addr, str)
|
||||||
|
}
|
||||||
|
this.LastConnectionStateMessage = str
|
||||||
}
|
}
|
||||||
|
|
||||||
case libnmdc.EVENT_PUBLIC:
|
case libnmdc.EVENT_PUBLIC:
|
||||||
@@ -135,7 +144,8 @@ func main() {
|
|||||||
os.MkdirAll(GetDirectoryNameForHub(hubaddr), 0755)
|
os.MkdirAll(GetDirectoryNameForHub(hubaddr), 0755)
|
||||||
|
|
||||||
// Launch logger
|
// Launch logger
|
||||||
go HubWorker(hubaddr, *nick, *password)
|
hw := HubWorker{}
|
||||||
|
go hw.MainLoop(hubaddr, *nick, *password)
|
||||||
|
|
||||||
launch_ct++
|
launch_ct++
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user