@@ -118,7 +118,7 @@ def load(self, filename):
118118 if filename is None :
119119 filename = LOCALCONFIG
120120 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 ) } " )
122122 self ._conf .update (json .load (fid ))
123123
124124 def save_local (self , verbose = False ):
@@ -254,7 +254,7 @@ def __setitem__(self, key, value):
254254 if key == "loglevel" :
255255 if value not in valid_logging_levels :
256256 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 )} "
258258 )
259259 logger .setLevel (value )
260260
@@ -265,11 +265,9 @@ def __setitem__(self, key, value):
265265 os .path .expanduser (n ) for n in (LOCALCONFIG , os .path .join ("~" , GLOBALCONFIG ))
266266)
267267try :
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 ) ))
269269except StopIteration :
270- pass
271- else :
272- config .load (config_file )
270+ logger .info ("No config file was found." )
273271
274272# override login credentials with environment variables
275273mapping = {
@@ -298,7 +296,7 @@ def __setitem__(self, key, value):
298296 if v is not None
299297}
300298if mapping :
301- logger .info (f"Loaded settings { tuple (mapping )} from environment variables." )
299+ logger .info (f"Overloaded settings { tuple (mapping )} from environment variables." )
302300 config .update (mapping )
303301
304302logger .setLevel (log_levels [config ["loglevel" ]])
0 commit comments