game-server 0.3.3 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.4.0

data/game-server.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "game-server"
-  s.version = "0.3.3"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["V_M"]
-  s.date = "2012-06-06"
+  s.date = "2012-06-28"
   s.description = "siply general-porpuse game server"
   s.email = "nobody@nowhere.com"
   s.extra_rdoc_files = [
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/blimp666/game-server"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.16"
+  s.rubygems_version = "1.8.15"
   s.summary = "simply game server"
 
   if s.respond_to? :specification_version then

data/lib/base_listner.rb

@@ -3,16 +3,12 @@ require File.dirname(__FILE__) + '/daemon_logger'
 # Базовый модуль для прослушивания JSON запросов от клиента
 module GameServer::BaseListner
 
-  include DaemonLogger
-  def log_file_path
-    Rails.root + 'log/socket.log'
-  end
-
+  include DaemonLogger::Mixins
 
   def find_controller(request)
     return unless request.name =~ /^[A-Za-z_]+$/
     x = (controllers_classes_root + "::" + request.name.camelize)
-    logger.info x
+    log x
     x.constantize
   rescue NameError
     return
@@ -41,14 +37,13 @@ module GameServer::BaseListner
   end
 
   def send_data(data)
-    logger.info "Data sended to #{connection_info}: " + data#.inspect
+    log "Data sended to #{connection_info}: " + data#.inspect
     super(data)
   end
 
 
   def critical_error(e)
-    logger.error e
-    logger.error e.backtrace.join("\n")
+    log_exception e
     send_error(e.class.to_s.underscore)
 #    close_connection_after_writing
   end
@@ -56,14 +51,13 @@ module GameServer::BaseListner
   # Обработать входящие данные (может быть несклько строк запросов в одном пакете данных)
   def receive_data(data)
     data.gsub!("\000", "")
-    logger.info "Received from #{connection_info}: " + data.inspect
+    log "Received from #{connection_info}: " + data.inspect
     return if policy_file_request(data)
     data.split("\n").each do |query_string|
       process_query(query_string)
     end
   rescue => e
     critical_error(e)
-    logger.info "\n\n\n\n\n\nCRITICAL RECEIVE DATA SERVER ERROR"
   end
 
   # Обработать один запрос
@@ -79,7 +73,6 @@ module GameServer::BaseListner
   rescue GameError => e
     send_error(e.class.to_s.underscore)
   rescue => e
-    logger.info "\n\n\n\n\n\nCRITICAL SERVER ERROR"
     critical_error(e)
   end
 

data/lib/client.rb

@@ -4,13 +4,11 @@ module GameServer::Client
   def receive_request(request)
     find_controller(request.name).new(self, request).run
   rescue Exception => e
-    logger.info "\n\n\n\n\n\nCRITICAL SERVER ERROR"
-    logger.error e
-    logger.error e.backtrace.join("\n")
+    log_exception e
   end
 
   def send_line(string)
-    logger.info "send_line #{string}\n"
+    log "send_line #{string}\n"
     send_data(string + "\n")
   end
 

data/lib/daemon_logger.rb

@@ -1,17 +1,64 @@
-module DaemonLogger
-  def init_logger
-    return if @logger
-    file = File.open(log_file_path, 'a')
+class DaemonLogger
+  include Singleton
+  attr_writer :logger
+  
+  class NullLogger
+    def method_missing(*args, &block)
+      p @args
+    end
+  end
+  
+  
+  def init(params)
+    raise TypeError.new(":log_file_path required") unless params[:log_file_path]
+    file = File.open(params[:log_file_path], 'a')
     file.sync = true
-    @logger = Logger.new(file)
-    @logger.level = Logger::DEBUG
-    @logger.formatter = Logger::Formatter.new
-    @logger.datetime_format = "%y-%m-%d %H:%M:%S.%L"
+    self.logger = Logger.new(file)
+    logger.level = Logger::DEBUG
+    logger.formatter = Logger::Formatter.new
+    logger.datetime_format = "%y-%m-%d %H:%M:%S.%L"
+  end
+  
+  def self.init(*params)
+    instance.init(*params)
   end
 
   def logger
-    init_logger
-    @logger
+    if @logger
+      @logger
+    else
+      warn 'Logger not initialized yet, run init with :log_file_path' 
+      NullLogger.new
+    end
+  end
+  
+  module Mixins
+    
+    def log(message, log_type = :info)
+      puts "#{Time.now} #{log_type} #{message}"
+      DaemonLogger.instance.logger.send(log_type, message)
+    end
+    
+    def log_exception(exception, send_mail = true, additional_info = "")
+      message = <<"EOF"
+Exception was raised #{exception}
+#{additional_info}
+
+BACKTRACE:
+#{exception.backtrace.join("\n")}
+EOF
+      puts "SENDING MAIL" if send_mail
+      log(message, :error)
+    end
+    
+    def with_exception_logging
+      yield
+    rescue => e
+      log_exception e, send_mail = true, additional_info = 'WITH EXCEPTION LOGGING CRITICAL ERROR'
+      raise e
+    end
+    
+    
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: game-server
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-06 00:00:00.000000000 Z
+date: 2012-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &75806050 !ruby/object:Gem::Requirement
+  requirement: &79377330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75806050
+  version_requirements: *79377330
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &75803220 !ruby/object:Gem::Requirement
+  requirement: &79376910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *75803220
+  version_requirements: *79376910
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &75802570 !ruby/object:Gem::Requirement
+  requirement: &79376480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *75802570
+  version_requirements: *79376480
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &75801770 !ruby/object:Gem::Requirement
+  requirement: &79375880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *75801770
+  version_requirements: *79375880
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &75801010 !ruby/object:Gem::Requirement
+  requirement: &79375370 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75801010
+  version_requirements: *79375370
 description: siply general-porpuse game server
 email: nobody@nowhere.com
 executables: []
@@ -109,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 394313517
+      hash: 410979699
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: simply game server