aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastien Douheret <sebastien.douheret@iot.bzh>2017-09-25 11:42:57 +0200
committerSebastien Douheret <sebastien.douheret@iot.bzh>2017-09-25 11:42:57 +0200
commitc1104e1be920ea11a42a873bad24e1f8f29990a6 (patch)
treec8c377780a42c9fb24863a5abb5f73de86a7ce8f
parentf7901489d13c90c0f4d4273e93eacc990087e6b8 (diff)
Cosmetic fix
Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
-rw-r--r--Makefile2
-rw-r--r--main.go4
2 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 6acaa14..f895166 100644
--- a/Makefile
+++ b/Makefile
@@ -190,6 +190,7 @@ tools/syncthing:
.PHONY:
tools/syncthing/copytobin:
@test -e $(LOCAL_TOOLSDIR)/syncthing$(EXT) -a -e $(LOCAL_TOOLSDIR)/syncthing-inotify$(EXT) || { echo "Please execute first: make tools/syncthing\n"; exit 1; }
+ @mkdir -p $(LOCAL_BINDIR)
@cp -f $(LOCAL_TOOLSDIR)/syncthing$(EXT) $(LOCAL_TOOLSDIR)/syncthing-inotify$(EXT) $(LOCAL_BINDIR)
.PHONY: help
@@ -197,6 +198,7 @@ help:
@echo "Main supported rules:"
@echo " all (default)"
@echo " build"
+ @echo " package"
@echo " install"
@echo " clean"
@echo " distclean"
diff --git a/main.go b/main.go
index a51a7a8..c73d881 100644
--- a/main.go
+++ b/main.go
@@ -209,8 +209,10 @@ func xdsApp(cliCtx *cli.Context) error {
return cli.NewExitError(err, -6)
}
- // Create and start Web Server
+ // Create Web Server
ctx.WWWServer = webserver.New(ctx.Config, ctx.MFolders, ctx.SDKs, ctx.Log)
+
+ // Run Web Server until exit requested (blocking call)
if err = ctx.WWWServer.Serve(); err != nil {
ctx.Log.Println(err)
return cli.NewExitError(err, -7)