Skip to content

Commit 5a00c2b

Browse files
committed
Linux: Remove 'username' option
Otherwise systemd cannot start this as a user service.
1 parent be2b8fa commit 5a00c2b

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

common/service.go

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ package common
22

33
import (
44
"fmt"
5-
"log"
65
"os"
7-
"os/user"
86
"path/filepath"
97
"strings"
108

@@ -27,19 +25,14 @@ func (d emptyDaemon) Stop(s service.Service) error {
2725
}
2826

2927
func NewServiceWithDaemon(daemon service.Interface) (Service, error) {
30-
user, err := user.Current()
31-
if err != nil {
32-
log.Fatalf(err.Error())
33-
}
34-
3528
options := make(service.KeyValue)
3629
options["Restart"] = "on-success"
3730
options["UserService"] = true
3831
options["RunAtLoad"] = true
3932

4033
ex, err := os.Executable()
4134
if err != nil {
42-
panic(err)
35+
return Service{}, tracerr.Wrap(err)
4336
}
4437
exDirPath := filepath.Dir(ex)
4538
executablePath := filepath.Join(exDirPath, "git-auto-sync-daemon")
@@ -48,11 +41,9 @@ func NewServiceWithDaemon(daemon service.Interface) (Service, error) {
4841
Name: "git-auto-sync-daemon",
4942
DisplayName: "Git Auto Sync Daemon",
5043
Description: "Background Process for Auto Syncing Git Repos",
51-
UserName: user.Username,
5244

5345
Executable: executablePath,
5446
Dependencies: []string{
55-
"Requires=network.target",
5647
"After=network-online.target syslog.target"},
5748
Option: options,
5849
}

daemon/main.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,18 @@ func main() {
4545
daemon := Daemon{}
4646
autoSyncService, err := common.NewServiceWithDaemon(&daemon)
4747
if err != nil {
48-
log.Fatal(err)
48+
log.Fatal("BuildService", err)
4949
}
5050

5151
s := autoSyncService.Service
5252
logger, err = s.Logger(nil)
5353
if err != nil {
54-
log.Fatal(err)
54+
log.Fatal("BuildLogger", err)
5555
}
5656

5757
err = s.Run()
5858
if err != nil {
59-
_ = logger.Error(err)
59+
log.Fatal("RunService", err)
6060
}
6161
}
6262

0 commit comments

Comments
 (0)