@@ -94,17 +94,17 @@ def applyOptions(process, options, applyToModules=False):
9494
9595def getClientOptions (options ):
9696 return dict (
97- compression = options .compression ,
98- useSharedMemory = not options .noShm ,
99- timeout = options .timeout ,
100- timeoutUnit = options .timeoutUnit ,
101- allowedTries = options .tries ,
97+ compression = cms . untracked . string ( options .compression ) ,
98+ useSharedMemory = cms . untracked . bool ( not options .noShm ) ,
99+ timeout = cms . untracked . uint32 ( options .timeout ) ,
100+ timeoutUnit = cms . untracked . string ( options .timeoutUnit ) ,
101+ allowedTries = cms . untracked . uint32 ( options .tries ) ,
102102 )
103103
104104def applyClientOptions (client , options ):
105105 return configureClient (client , ** getClientOptions (options ))
106106
107- def configureModules (process , modules = None , ** kwargs ):
107+ def configureModules (process , modules = None , returnConfigured = False , ** kwargs ):
108108 if modules is None :
109109 modules = {}
110110 modules .update (process ._Process__producers )
@@ -115,7 +115,10 @@ def configureModules(process, modules=None, **kwargs):
115115 if hasattr (producer ,'Client' ):
116116 producer .Client = configureClient (producer .Client , ** kwargs )
117117 configured .append (pname )
118- return process , configured
118+ if returnConfigured :
119+ return process , configured
120+ else :
121+ return process
119122
120123def configureClient (client , ** kwargs ):
121124 client .update_ (kwargs )
@@ -137,7 +140,7 @@ def configureLogging(process, client=False, server=False, service=False, discove
137140 process .TritonService .verbose = service or discovery
138141 process .TritonService .fallback .verbose = server
139142 if client :
140- process , configured = configureModules (process , verbose = True )
143+ process , configured = configureModules (process , returnConfigured = True , verbose = True )
141144 for module in configured :
142145 keepMsgs .extend ([module , module + ':TritonClient' ])
143146
0 commit comments