@@ -118,7 +118,7 @@ def load(self, filename):
118
118
if filename is None :
119
119
filename = LOCALCONFIG
120
120
with open (filename , "r" ) as fid :
121
- logger .info (f"Reading dj.config from { filename } " )
121
+ logger .info (f"DataJoint is configured from { os . path . abspath ( filename ) } " )
122
122
self ._conf .update (json .load (fid ))
123
123
124
124
def save_local (self , verbose = False ):
@@ -254,7 +254,7 @@ def __setitem__(self, key, value):
254
254
if key == "loglevel" :
255
255
if value not in valid_logging_levels :
256
256
raise ValueError (
257
- f"{ ' value' } is not a valid logging value { tuple (valid_logging_levels )} "
257
+ f"' { value } ' is not a valid logging value { tuple (valid_logging_levels )} "
258
258
)
259
259
logger .setLevel (value )
260
260
@@ -265,11 +265,9 @@ def __setitem__(self, key, value):
265
265
os .path .expanduser (n ) for n in (LOCALCONFIG , os .path .join ("~" , GLOBALCONFIG ))
266
266
)
267
267
try :
268
- config_file = next (n for n in config_files if os .path .exists (n ))
268
+ config . load ( next (n for n in config_files if os .path .exists (n ) ))
269
269
except StopIteration :
270
- pass
271
- else :
272
- config .load (config_file )
270
+ logger .info ("No config file was found." )
273
271
274
272
# override login credentials with environment variables
275
273
mapping = {
@@ -298,7 +296,7 @@ def __setitem__(self, key, value):
298
296
if v is not None
299
297
}
300
298
if mapping :
301
- logger .info (f"Loaded settings { tuple (mapping )} from environment variables." )
299
+ logger .info (f"Overloaded settings { tuple (mapping )} from environment variables." )
302
300
config .update (mapping )
303
301
304
302
logger .setLevel (log_levels [config ["loglevel" ]])
0 commit comments