tkellem 0.8.2 → 0.8.3

data/lib/tkellem.rb

@@ -16,7 +16,7 @@ module Tkellem
       @trace = val
     end
     def self.trace
-      @trace || @trace = true
+      @trace || @trace = false
     end
 
     def log_name

data/lib/tkellem/bouncer.rb

@@ -21,7 +21,7 @@ class Bouncer
     # maps { client_conn => state_hash }
     @active_conns = {}
     @welcomes = []
-    @rooms = ['#tk']
+    @rooms = []
     # maps { client_conn => away_status_or_nil }
     @away = {}
     # plugin data

data/lib/tkellem/daemon.rb

@@ -46,10 +46,6 @@ class Tkellem::Daemon
       exit(status ? 0 : 1)
     when 'restart'
       stop if status(false)
-      while status(false)
-        print "."
-        sleep(0.5)
-      end
       daemonize
       start
     when 'admin'
@@ -104,18 +100,25 @@ class Tkellem::Daemon
     @daemon = true
     File.open(pid_file, 'wb') { |f| f.write(Process.pid.to_s) }
 
-    # TODO: set up logging
+    # TODO: support syslog
+    require 'logger'
+    logger = Logger.new(log_file)
     STDIN.reopen("/dev/null")
-    STDOUT.reopen("/dev/null")
+    STDOUT.reopen(log_file, 'a')
     STDERR.reopen(STDOUT)
-    # STDOUT.sync = STDERR.sync = true
+    STDOUT.sync = STDERR.sync = true
   end
 
   def stop
     pid = File.read(pid_file) if File.file?(pid_file)
     if pid.to_i > 0
-      puts "Stopping tkellem #{pid}..."
+      puts "Stopping tkellem #{pid}"
       Process.kill('INT', pid.to_i)
+      while status(false)
+        print "."
+        sleep(0.5)
+      end
+      puts
     else
       status
     end
@@ -152,4 +155,8 @@ class Tkellem::Daemon
     File.join(path, 'tkellem.socket')
   end
 
+  def log_file
+    File.join(path, 'tkellem.log')
+  end
+
 end

data/lib/tkellem/version.rb

@@ -1,3 +1,3 @@
 module Tkellem
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

metadata

@@ -2,7 +2,7 @@
 name: tkellem
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors: 
 - Brian Palmer
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-13 00:00:00 -06:00
+date: 2011-06-14 00:00:00 -06:00
 default_executable: tkellem
 dependencies: 
 - !ruby/object:Gem::Dependency