diff --git a/__init__.py b/__init__.py index 2d15424..958ffc9 100644 --- a/__init__.py +++ b/__init__.py @@ -32,13 +32,13 @@ from servicemanager.nicosman import NicosManager from servicemanager.seaman import SeaManager from servicemanager.frappyman import FrappyManager, Reconnect, Keep from servicemanager.sewebman import SewebManager -from servicemanager.sehistoryman import SehistoryManager +from servicemanager.feederman import FeederManager #from servicemanager.racks import RackConfig #rack = RackConfig() -all = NicosManager, FrappyManager, SeaManager, SewebManager, SehistoryManager +all = NicosManager, FrappyManager, SeaManager, SewebManager, FeederManager KINDS = 'action', 'ins', 'service' diff --git a/bin/feeder b/bin/feeder new file mode 100755 index 0000000..97247ee --- /dev/null +++ b/bin/feeder @@ -0,0 +1,8 @@ +#!/usr/bin/env python3 + +import sys +from os.path import expanduser +sys.path.append(expanduser('~')) +from servicemanager import run + +run('feeder', sys.argv[1:]) diff --git a/sehistoryman.py b/feederman.py similarity index 59% rename from sehistoryman.py rename to feederman.py index 8e10c7f..d68a35e 100644 --- a/sehistoryman.py +++ b/feederman.py @@ -19,20 +19,33 @@ # # ***************************************************************************** +from os.path import expanduser +from configparser import ConfigParser from servicemanager.base import ServiceManager -class SehistoryManager(ServiceManager): - group = 'sehistory' +class FeederManager(ServiceManager): + group = 'feeder' services = ('central', 'local') USAGE = """ Usage: - sehistory start - sehistory restart - sehistory stop - sehistory list [] + feeder start + feeder restart + feeder stop + feeder list [] %s """ + def __init__(self): + parser = ConfigParser() + parser.read(expanduser('~/.config/sehistory')) + services = tuple(s for s in self.services if s in parser.sections()) + self.services = services + super().__init__() + + def treat_args(self, argdict, unknown=(), extra=()): + if not argdict.get('ins'): + argdict['ins'] = self.single_ins + return super().treat_args(argdict, unknown, extra)