summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rw-r--r--main.go26
2 files changed, 18 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index 760b411..90c57fe 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ BUILDTIME = $(shell date +%Y.%m.%d_%H%M)
all: install
forged merge
- forged list
+ forged
build: goimports
GO111MODULE=off go build \
@@ -43,6 +43,8 @@ run: build
prod: build
make stop
cp forged /usr/bin/forged
+ cp -a forged.service /lib/systemd/system/forged.service
+ systemctl daemon-reload
make start
journalctl -n 10 -xeu forged.service
diff --git a/main.go b/main.go
index 2eae239..c74409b 100644
--- a/main.go
+++ b/main.go
@@ -73,18 +73,22 @@ func main() {
okExit("")
}
- // if argv.Daemon == true {
- http.HandleFunc("/", okHandler)
- // go https() // use caddy instead
- p := fmt.Sprintf(":%d", argv.Port)
- log.Println(argv.Version(), "HOSTNAME set to:", HOSTNAME)
- log.Println("Running on port", "http://localhost"+p)
- log.Println("Running on port", "http://localhost"+p+"/ipv6.png")
- err := http.ListenAndServe(p, nil)
- if err != nil {
- log.Println("Error starting server:", err)
+ if argv.Daemon == true {
+ log.Info("Running in --daemon mode")
+ http.HandleFunc("/", okHandler)
+ // go https() // use caddy instead
+ p := fmt.Sprintf(":%d", argv.Port)
+ log.Println(argv.Version(), "HOSTNAME set to:", HOSTNAME)
+ log.Println("Running on port", "http://localhost"+p)
+ log.Println("Running on port", "http://localhost"+p+"/ipv6.png")
+ err := http.ListenAndServe(p, nil)
+ if err != nil {
+ log.Println("Error starting server:", err)
+ }
+ } else {
+ log.Info("--daemon was not set. Just list the patches.")
+ doList()
}
- // }
}
func formatDuration(d time.Duration) string {