Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-01-05 17:52:39 +01:00
Code Issues Projects Releases Wiki Activity

Now we don't print anything before daemonizing.

Browse Source
This commit is contained in:
Jeremy Fincher 2004-12-02 05:59:21 +00:00
parent 955bf08255
commit c8bdb45a2c
1 changed files with 36 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
scripts/supybot
View File

@ -245,8 +245,6 @@ if __name__ == '__main__':
# XXX We should turn off logging here for a prettier presentation. # XXX We should turn off logging here for a prettier presentation.
sys.exit(-1) sys.exit(-1)
if options.optimize: if options.optimize:
# This doesn't work anymore. # This doesn't work anymore.
__builtins__.__debug__ = False __builtins__.__debug__ = False
@ -257,43 +255,6 @@ if __name__ == '__main__':
except ImportError: except ImportError:
log.warning('Psyco isn\'t installed, cannot -OO.') log.warning('Psyco isn\'t installed, cannot -OO.')
conf.allowEval = options.allowEval
conf.allowDefaultOwner = options.allowDefaultOwner
if not os.path.exists(conf.supybot.directories.log()):
os.mkdir(conf.supybot.directories.log())
if not os.path.exists(conf.supybot.directories.conf()):
os.mkdir(conf.supybot.directories.conf())
if not os.path.exists(conf.supybot.directories.data()):
os.mkdir(conf.supybot.directories.data())
if not os.path.exists(conf.supybot.directories.data.tmp()):
os.mkdir(conf.supybot.directories.tmp())
userdataFilename = os.path.join(conf.supybot.directories.conf(),
'userdata.conf')
# Let's open this now since we've got our directories setup.
if not os.path.exists(userdataFilename):
fd = file(userdataFilename, 'w')
fd.write('\n')
fd.close()
registry.open(userdataFilename)
import supybot.Owner as Owner
import supybot.irclib as irclib
import supybot.ircmsgs as ircmsgs
import supybot.drivers as drivers
import supybot.callbacks as callbacks
owner = Owner.Class()
irclib._callbacks.append(owner)
if options.debug:
for (name, module) in sys.modules.iteritems():
if hasattr(module, '__file__') and hasattr(module, '__revision__'):
if module.__file__.startswith(supybot.installDir):
print '%s: %s' % (name, module.__revision__.split()[2])
# XXX This should go before we instantiate Irc objects, so we don't print.
if os.name == 'posix' and options.daemon: if os.name == 'posix' and options.daemon:
def fork(): def fork():
child = os.fork() child = os.fork()
@ -344,6 +305,42 @@ if __name__ == '__main__':
except EnvironmentError, e: except EnvironmentError, e:
log.error('Error opening pid file %s: %s', pidFile, e) log.error('Error opening pid file %s: %s', pidFile, e)
conf.allowEval = options.allowEval
conf.allowDefaultOwner = options.allowDefaultOwner
if not os.path.exists(conf.supybot.directories.log()):
os.mkdir(conf.supybot.directories.log())
if not os.path.exists(conf.supybot.directories.conf()):
os.mkdir(conf.supybot.directories.conf())
if not os.path.exists(conf.supybot.directories.data()):
os.mkdir(conf.supybot.directories.data())
if not os.path.exists(conf.supybot.directories.data.tmp()):
os.mkdir(conf.supybot.directories.tmp())
userdataFilename = os.path.join(conf.supybot.directories.conf(),
'userdata.conf')
# Let's open this now since we've got our directories setup.
if not os.path.exists(userdataFilename):
fd = file(userdataFilename, 'w')
fd.write('\n')
fd.close()
registry.open(userdataFilename)
import supybot.Owner as Owner
import supybot.irclib as irclib
import supybot.ircmsgs as ircmsgs
import supybot.drivers as drivers
import supybot.callbacks as callbacks
owner = Owner.Class()
irclib._callbacks.append(owner)
if options.debug:
for (name, module) in sys.modules.iteritems():
if hasattr(module, '__file__') and hasattr(module, '__revision__'):
if module.__file__.startswith(supybot.installDir):
print '%s: %s' % (name, module.__revision__.split()[2])
if options.profile: if options.profile:
import profile import profile
world.profiling = True world.profiling = True