Changeset 1072

Timestamp:

03/17/10 19:34:47 (23 months ago)

Author:

james

Message:

fix loading file named for bot from local/ folder (was only looking in modules/)
load settings files in correct order for overriding defaults
report which settings files were loaded when we start
report which settings files were loaded in .bmotion status

Location:

trunk

Files:

• bMotion.tcl (modified) (3 diffs)
• plugins/admin_general.tcl (modified) (1 diff)

trunk/bMotion.tcl

@@ -82 +82 @@
   putlog "... loading settings"
 }
+
+set bMotion_loaded_settings_from [list]
+
 # try the original location first
 set bMotion_loaded_settings 0
@@ -88 +91 @@
         bMotion_putloglev d * "loaded settings from modules directory"
         set bMotion_loaded_settings 1
-}
-
-#try to load a file for this bot
-catch {
-  if {${botnet-nick} != ""} {
-    source "$bMotionModules/settings_${botnet-nick}.tcl"
-    bMotion_putloglev d * "loaded settings for this bot from settings_${botnet-nick}.tcl"
-                set bMotion_loaded_settings 1
-  }
+        lappend bMotion_loaded_settings_from "$bMotionModules/settings.tcl"
 }
 
@@ -104 +99 @@
         bMotion_putloglev d * "loaded local settings from $bMotionLocal/settings.tcl"
         set bMotion_loaded_settings 1
-}
+        lappend bMotion_loaded_settings_from "$bMotionLocal/settings.tcl"
+}
+
+#try to load a file for this bot
+catch {
+  if {${botnet-nick} != ""} {
+    source "$bMotionModules/settings_${botnet-nick}.tcl"
+    bMotion_putloglev d * "loaded settings for this bot from settings_${botnet-nick}.tcl"
+                set bMotion_loaded_settings 1
+                lappend bMotion_loaded_settings_from "$bMotionModules/settings_${botnet-nick}.tcl"
+  }
+}
+
+#try to load a file for this bot
+catch {
+  if {${botnet-nick} != ""} {
+    source "$bMotionLocal/settings_${botnet-nick}.tcl"
+    bMotion_putloglev d * "loaded settings for this bot from settings_${botnet-nick}.tcl"
+                set bMotion_loaded_settings 1
+                lappend bMotion_loaded_settings_from "$bMotionLocal/settings_${botnet-nick}.tcl"
+  }
+}
+
+putlog "bMotion: loaded settings from the following files: $bMotion_loaded_settings_from"
 
 if {$bMotion_loaded_settings == 0} {

trunk/plugins/admin_general.tcl

@@ -70 +70 @@
                 bMotion_putadmin "I am away."
         }
+        
+        global bMotion_loaded_settings_from
+        bMotion_putadmin "I loaded my configuration from: $bMotion_loaded_settings_from"
 
         return 0