commit 76e1a2d67d01673970ba10c251fab2602afc4c63
parent 4ccec387297de707254cc6ea0dc5ca6268c8d040
Author: Suraj N. Kurapati <sunaku@gmail.com>
Date: Sun, 17 Sep 2006 05:33:46 -0700
[project @ 67312ad89586996130a1103842f24cf5af10dd45]
[project @ 103]
mv log messages from config into loader
Diffstat:
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/wmiirc b/wmiirc
@@ -22,15 +22,20 @@ require 'logger'
LOG = Logger.new(__FILE__ + '.log', 5)
+
+LOG.info($$) {"starting"}
+
begin
load File.join(File.dirname(__FILE__), 'wmiirc-config.rb')
rescue => e
LOG.error e
- LOG.info(__FILE__) {"resuming from error"}
+ LOG.info($$) {"recovering from error"}
retry
rescue Exception => e
LOG.fatal e
end
+
+LOG.info($$) {"stopping"}
diff --git a/wmiirc-config.rb b/wmiirc-config.rb
@@ -25,9 +25,6 @@ FS = Wmii.fs
## WM startup
-at_exit do LOG.info($$) {"exiting #{__FILE__}"} end
-LOG.info($$) {"starting #{__FILE__}"}
-
FS.event = "Start #{__FILE__}\n"
@@ -435,7 +432,7 @@ begin
case type.to_sym
when :Start
if arg == __FILE__
- LOG.info($$) {"another config is starting"}
+ LOG.info($$) {"another instance is starting"}
exit
end
@@ -470,6 +467,6 @@ begin
end
end
rescue EOFError
- LOG.warn "wmii has been terminated"
+ LOG.warn($$) {"wmii has been terminated"}
exit 1
end