emissary 1.3.8 → 1.3.9

data/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 1
 :minor: 3
-:patch: 8
+:patch: 9

data/lib/emissary.rb

@@ -17,6 +17,7 @@ require 'rubygems'
 require 'uuid'
 require 'digest/md5'
 require 'yaml'
+require 'pathname'
 
 begin
   require 'thread'
@@ -26,14 +27,14 @@ end
 
 module Emissary
   # :stopdoc:
-  LIBPATH = File.expand_path(File.dirname(File.expand_path(__FILE__))) + File::SEPARATOR
-  PATH = File.dirname(LIBPATH) + File::SEPARATOR
-  VERSION = ::YAML.load(File.read(File.join(PATH, 'VERSION.yml'))).values.join '.'
+  LIBPATH = Pathname.new(__FILE__).dirname.realpath 
+  PATH    = LIBPATH.dirname
+  VERSION = ::YAML.load(PATH + 'VERSION.yml')).values.join '.'
 
-  EXTERNALS_BASE      = File.join(File::SEPARATOR, 'opt')
-  EXTERNAL_IDENTITIES = File.join(EXTERNALS_BASE, 'emissary', 'identities')
-  EXTERNAL_AGENTS     = File.join(EXTERNALS_BASE, 'emissary', 'agents')
-  EXTERNAL_OPERATORS  = File.join(EXTERNALS_BASE, 'emissary', 'operators')
+  EXTERNALS_BASE      = Pathname.new('/opt/emissary')
+  EXTERNAL_IDENTITIES = EXTERNALS_BASE + 'identities'
+  EXTERNAL_AGENTS     = EXTERNALS_BASE + 'agents'
+  EXTERNAL_OPERATORS  = EXTERNALS_BASE + 'operators'
 
   DEFAULT_EXCHANGE        = :direct
   DAEMON_RECHECK_INTERVAL = 10
@@ -58,7 +59,7 @@ module Emissary
     # <tt>File.join</tt>.
     #
     def libpath( *args )
-      args.empty? ? LIBPATH : File.join(LIBPATH, args.flatten)
+      LIBPATH.join(args.flatten)
     end
   
     # Returns the path for the module. If any arguments are given,

data/lib/emissary/agent/mysql.rb

@@ -116,6 +116,16 @@ module Emissary
   
     
     def connection
+      begin
+        @connection.ping() unless @connection.nil?
+      rescue ::Mysql::Error => e
+        if e.message =~ /server has gone away/
+          @connection = nil
+        else
+          raise e
+        end
+      end
+      
       @connection ||= ::Mysql.real_connect(@host, @user, @password)
     end
   
@@ -165,8 +175,8 @@ module Emissary
           }
         end
       ensure
-        kill_watcher_thread!
         disconnect
+        kill_watcher_thread!
       end
     end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: emissary
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 1
   - 3
-  - 8
-  version: 1.3.8
+  - 9
+  version: 1.3.9
 platform: ruby
 authors: 
 - Carl P. Corliss
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-18 00:00:00 -04:00
+date: 2011-06-15 00:00:00 -04:00
 default_executable: bin/emissary-setup
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -228,7 +228,7 @@ files:
 - VERSION.yml
 - LICENSE
 - README.txt
-has_rdoc: true
+has_rdoc: false
 homepage: http://www.nytimes.com/
 licenses: []