@@ -223,14 +223,20 @@ def scheduler(ctx, xmlrpc, xmlrpc_host, xmlrpc_port,
223223 help = 'Fetcher class to be used.' )
224224@click .pass_context
225225def fetcher (ctx , xmlrpc , xmlrpc_host , xmlrpc_port , poolsize , proxy , user_agent ,
226- timeout , fetcher_cls , async = True , get_object = False , g = None ):
226+ timeout , fetcher_cls , async = True , get_object = False , no_input = False ):
227227 """
228228 Run Fetcher.
229229 """
230- g = g or ctx .obj
230+ g = ctx .obj
231231 Fetcher = load_cls (None , None , fetcher_cls )
232232
233- fetcher = Fetcher (inqueue = g .scheduler2fetcher , outqueue = g .fetcher2processor ,
233+ if no_input :
234+ inqueue = None
235+ outqueue = None
236+ else :
237+ inqueue = g .scheduler2fetcher
238+ outqueue = g .fetcher2processor
239+ fetcher = Fetcher (inqueue = inqueue , outqueue = outqueue ,
234240 poolsize = poolsize , proxy = proxy , async = async )
235241 fetcher .phantomjs_proxy = g .phantomjs_proxy
236242 if user_agent :
@@ -346,10 +352,7 @@ def webui(ctx, host, port, cdn, scheduler_rpc, fetcher_rpc, max_rate, max_burst,
346352 else :
347353 # get fetcher instance for webui
348354 fetcher_config = g .config .get ('fetcher' , {})
349- mock_g = copy .copy (g )
350- mock_g ['scheduler2fetcher' ] = None
351- mock_g ['fetcher2processor' ] = None
352- webui_fetcher = ctx .invoke (fetcher , async = False , get_object = True , g = mock_g , ** fetcher_config )
355+ webui_fetcher = ctx .invoke (fetcher , async = False , get_object = True , no_input = True , ** fetcher_config )
353356
354357 app .config ['fetch' ] = lambda x : webui_fetcher .fetch (x )
355358
0 commit comments