corrected service condition

pull/20066/head
Brian Coca 8 years ago
parent d9b89ca577
commit afbe3bd63f

@ -48,8 +48,10 @@ endif
ifeq ($(shell echo $(OS) | egrep -c 'Darwin|FreeBSD|OpenBSD|DragonFly'),1) ifeq ($(shell echo $(OS) | egrep -c 'Darwin|FreeBSD|OpenBSD|DragonFly'),1)
DATE := $(shell date -j -r $(shell git log -n 1 --format="%at") +%Y%m%d%H%M) DATE := $(shell date -j -r $(shell git log -n 1 --format="%at") +%Y%m%d%H%M)
CPUS := $(shell sysctl hw.ncpu|awk '{print $2}')
else else
DATE := $(shell date --utc --date="$(GIT_DATE)" +%Y%m%d%H%M) DATE := $(shell date --utc --date="$(GIT_DATE)" +%Y%m%d%H%M)
CPUS := $(shell nproc)
endif endif
# DEB build parameters # DEB build parameters

@ -626,7 +626,7 @@ class LinuxService(Service):
if "stop" in cleanout: if "stop" in cleanout:
self.running = False self.running = False
elif "run" in cleanout: elif "run" in cleanout:
self.running = ("not " in cleanout) self.running = not ("not " in cleanout)
elif "start" in cleanout and "not " not in cleanout: elif "start" in cleanout and "not " not in cleanout:
self.running = True self.running = True
elif 'could not access pid file' in cleanout: elif 'could not access pid file' in cleanout:

Loading…
Cancel
Save