valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Deprecate PidfileMixin

Browse Source
This commit is contained in:
Pedro Algarvio 2015-11-05 00:54:37 +00:00
parent 69b553c245
commit e635e9b88a
1 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
salt/utils/parsers.py
View File

@ -849,6 +849,12 @@ class PidfileMixin(six.with_metaclass(MixInMeta, object)):
_mixin_prio_ = 40
def _mixin_setup(self):
salt.utils.warn_until(
'Nitrogen',
'Please stop sub-classing PidfileMix and instead subclass '
'DaemonMixIn which contains the same behavior. PidfileMixin '
'will be supported until Salt {version}.'
)
self.add_option(
'--pid-file', dest='pidfile',
default=os.path.join(
@ -876,7 +882,7 @@ class PidfileMixin(six.with_metaclass(MixInMeta, object)):
return get_pidfile(self.config['pidfile'])
class DaemonMixIn(PidfileMixin):
class DaemonMixIn(six.with_metaclass(MixInMeta, object)):
_mixin_prio_ = 30
def _mixin_setup(self):
@ -886,11 +892,36 @@ class DaemonMixIn(PidfileMixin):
action='store_true',
help='Run the {0} as a daemon'.format(self.get_prog_name())
)
self.add_option(
'--pid-file', dest='pidfile',
default=os.path.join(
syspaths.PIDFILE_DIR, '{0}.pid'.format(self.get_prog_name())
),
help=('Specify the location of the pidfile. Default: %default')
)
def _mixin_before_exit(self):
if self.check_pidfile():
os.unlink(self.config['pidfile'])
def set_pidfile(self):
from salt.utils.process import set_pidfile
set_pidfile(self.config['pidfile'], self.config['user'])
def check_pidfile(self):
'''
Report whether a pidfile exists
'''
from salt.utils.process import check_pidfile
return check_pidfile(self.config['pidfile'])
def get_pidfile(self):
'''
Return a pid contained in a pidfile
'''
from salt.utils.process import get_pidfile
return get_pidfile(self.config['pidfile'])
def daemonize_if_required(self):
if self.options.daemon:
if self._setup_mp_logging_listener_ is True: