Skip to content

Commit eb608b8

Browse files
author
shaleman
committed
fix sanity failure
1 parent 93f4192 commit eb608b8

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

netmaster/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ func (d *daemon) ListenAndServe() {
194194
"Godeps/_workspace/src/github.com/contiv/objmodel/contivModel/www/"
195195
_, err := os.Stat(webPath)
196196
if err != nil {
197-
log.Fatalf("Can not find the web UI directory")
197+
log.Errorf("Can not find the web UI directory")
198198
}
199199
}
200200

scripts/start-swarm.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ echo "starting swarm join"
2525
# Start swarm discovery
2626
nohup /usr/bin/swarm join --advertise=$node_addr:2385 etcd://localhost:2379 > /tmp/swarm-join.log 2>&1 &
2727

28-
echo "starting netplugin"
28+
# echo "starting netplugin"
2929
# start netplugin
30-
nohup /opt/gopath/bin/netplugin -native-integration=true > /tmp/netplugin.log 2>&1 &
30+
# nohup /opt/gopath/bin/netplugin -native-integration=true > /tmp/netplugin.log 2>&1 &
3131

3232
if [[ $mode == "master" ]]; then
33-
echo "starting netmaster"
34-
#start netmaster
35-
nohup /opt/gopath/bin/netmaster > /tmp/netmaster.log 2>&1 &
33+
# echo "starting netmaster"
34+
# start netmaster
35+
# nohup /opt/gopath/bin/netmaster > /tmp/netmaster.log 2>&1 &
3636

3737
unset http_proxy
3838
unset https_proxy

0 commit comments

Comments
 (0)