Skip to content

Commit 6d04eb8

Browse files
committed
Make the logger a module variable
1 parent 6fb86de commit 6d04eb8

File tree

5 files changed

+27
-8
lines changed

5 files changed

+27
-8
lines changed

examples/bigger_uproot.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@
2929
from servicex import ServiceXSpec, General, Sample
3030
from servicex.func_adl.func_adl_dataset import FuncADLQuery
3131
from servicex.servicex_client import deliver
32+
import logging
33+
34+
logging.basicConfig(level=logging.INFO)
35+
logger = logging.getLogger("servicex")
36+
logger.setLevel(logging.DEBUG)
3237

3338
query = FuncADLQuery().Select(lambda e: {'el_pt': e['el_pt']})
3439

examples/databinder.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,14 @@
3131

3232
from servicex import ServiceXSpec
3333
from servicex.servicex_client import deliver
34+
import logging
35+
36+
logging.basicConfig(level=logging.INFO)
37+
logger = logging.getLogger("servicex")
38+
logger.setLevel(logging.DEBUG)
3439

3540
if len(sys.argv) != 2:
36-
print("Usage: python databinder.py <config_file>")
41+
logger.fatal("Usage: python databinder.py <config_file>")
3742
sys.exit(1)
3843

3944
try:

examples/single_file_uproot.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@
3434
from servicex.func_adl.func_adl_dataset import FuncADLQuery
3535
from servicex.servicex_client import deliver
3636

37+
import logging
38+
39+
logging.basicConfig(level=logging.INFO)
40+
logger = logging.getLogger("servicex")
41+
logger.setLevel(logging.DEBUG)
42+
43+
3744
query = FuncADLQuery().Select(lambda e: {'lep_pt': e['lep_pt']}). \
3845
Where(lambda e: e['lep_pt'] > 1000)
3946

servicex/query.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
from make_it_sync import make_sync
6161

6262
ProgressIndicators = Union[Progress, ExpandableProgress]
63+
logger = logging.getLogger(__name__)
6364

6465

6566
class Query(ABC):
@@ -185,21 +186,21 @@ def transform_complete(task: Task):
185186
:return:
186187
"""
187188
if task.exception():
188-
logging.getLogger(__name__).error(
189+
logger.error(
189190
"ServiceX Exception", exc_info=task.exception()
190191
)
191192
if download_files_task:
192193
download_files_task.cancel("Transform failed")
193194
raise task.exception()
194195

195196
if self.current_status.files_failed:
196-
logging.getLogger(__name__).warning(
197+
logger.warning(
197198
f"Transforms completed with failures "
198199
f"{self.current_status.files_failed} files failed out of "
199200
f"{self.current_status.files}"
200201
)
201202
else:
202-
logging.getLogger(__name__).info("Transforms completed successfully")
203+
logger.info("Transforms completed successfully")
203204

204205
sx_request = self.transform_request
205206

@@ -220,7 +221,7 @@ def transform_complete(task: Task):
220221
or not signed_urls_only
221222
and cached_record.file_list
222223
):
223-
logging.getLogger(__name__).info("Returning results from cache")
224+
logger.info("Returning results from cache")
224225
return cached_record
225226

226227
# If we get here with a cached record, then we know that the transform
@@ -305,7 +306,7 @@ def transform_complete(task: Task):
305306

306307
return transform_report
307308
except CancelledError:
308-
logging.getLogger(__name__).warning(
309+
logger.warning(
309310
"Aborted file downloads due to transform failure"
310311
)
311312

@@ -366,7 +367,7 @@ async def retrieve_current_transform_status(self):
366367
# Is this the first time we've polled status? We now know the request ID.
367368
# Update the display and set our download directory.
368369
if not self.current_status:
369-
logging.getLogger(__name__).info(
370+
logger.info(
370371
f"ServiceX Transform {s.title}: {s.request_id}"
371372
)
372373
self.download_path = self.cache.cache_path_for_transform(s)

servicex/servicex_client.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
from servicex.databinder_models import ServiceXSpec, General, Sample
4444

4545
T = TypeVar("T")
46+
logger = logging.getLogger(__name__)
4647

4748

4849
def deliver(config: ServiceXSpec):
@@ -180,7 +181,7 @@ def get_code_generators(self, backend=None):
180181
if backend:
181182
cached_backends = self.query_cache.get_codegen_by_backend(backend)
182183
if cached_backends:
183-
logging.getLogger(__name__).info("Returning code generators from cache")
184+
logger.info("Returning code generators from cache")
184185
return cached_backends["codegens"]
185186
else:
186187
code_generators = self.servicex.get_code_generators()

0 commit comments

Comments
 (0)