Permalink
Browse files

move the minion daemonization back to before auth, like it was in 0.9.8

Fix #1145
  • Loading branch information...
1 parent 01a7998 commit b51a1019739f6664888a3085226e911c9472d5b4 @thatch45 thatch45 committed Apr 26, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 salt/__init__.py
View
@@ -187,11 +187,11 @@ def start(self):
# Late import so logging works correctly
import salt.minion
log = logging.getLogger(__name__)
- minion = salt.minion.Minion(self.opts)
if self.cli['daemon']:
# Late import so logging works correctly
import salt.utils
salt.utils.daemonize()
+ minion = salt.minion.Minion(self.opts)
@SEJeff

SEJeff Apr 26, 2012

Member

TODO: Put a comment above this line on why it is before the auth so this doesn't accidentally happen again later in the future.

set_pidfile(self.cli['pidfile'])
if check_user(self.opts['user'], log):
try:

0 comments on commit b51a101

Please sign in to comment.