Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-01-11 12:42:34 +01:00
Code Issues Projects Releases Wiki Activity

Move disableMultiprocessing from supybot.conf to supybot.world in order for it not to be in the config file.

Browse Source
This commit is contained in:
Valentin Lorentz 2014-08-14 14:16:15 +02:00
parent 41d63c7888
commit bd1ac36c2c
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/supybot
View File

@ -314,7 +314,7 @@ if __name__ == '__main__':
sys.exit(-1) sys.exit(-1)
conf.allowDefaultOwner = options.allowDefaultOwner conf.allowDefaultOwner = options.allowDefaultOwner
conf.disableMultiprocessing = options.disableMultiprocessing world.disableMultiprocessing = options.disableMultiprocessing
if not os.path.exists(conf.supybot.directories.log()): if not os.path.exists(conf.supybot.directories.log()):
os.mkdir(conf.supybot.directories.log()) os.mkdir(conf.supybot.directories.log())

2
scripts/supybot-test
View File

@ -152,7 +152,7 @@ if __name__ == '__main__':
help='Disables multiprocessing stuff.') help='Disables multiprocessing stuff.')
(options, args) = parser.parse_args() (options, args) = parser.parse_args()
conf.disableMultiprocessing = options.disableMultiprocessing world.disableMultiprocessing = options.disableMultiprocessing
# This must go before checking for args, of course. # This must go before checking for args, of course.
for pluginDir in options.pluginsDirs: for pluginDir in options.pluginsDirs:

2
src/commands.py
View File

@ -86,7 +86,7 @@ def process(f, *args, **kwargs):
if resource and heap_size is None: if resource and heap_size is None:
heap_size = resource.RLIM_INFINITY heap_size = resource.RLIM_INFINITY
if conf.disableMultiprocessing: if world.disableMultiprocessing:
pn = kwargs.pop('pn', 'Unknown') pn = kwargs.pop('pn', 'Unknown')
cn = kwargs.pop('cn', 'unknown') cn = kwargs.pop('cn', 'unknown')
try: try: