jlog-rails 0.0.5 → 0.1.0

data/app/controllers/jlog/ajax_controller.rb

@@ -3,19 +3,21 @@ module Jlog
   class AjaxController < ActionController::Metal
     include ActionController::Rendering
 
+    Levels = ['DEBUG', 'INFO', 'WARN', 'ERROR', 'FATAL']
+    LevelsPattern = Regexp.new("^(#{Levels.join("|")})", Regexp::IGNORECASE)
+
     def append
-      messages = params[:message]
-      messages = [messages] unless messages.is_a? Array
+      messages = Array(params[:message])
       messages.each do |message|
-        level_pattern = /^(DEBUG|INFO|WARN|ERROR|FATAL)/
-        level = message.match(level_pattern)[1]
-        message = "#{Time.now} Client " << message
+        path = request.original_fullpath
+        output = JLog.formatter(path).call(:path => path, :message => message)
 
-        if ['DEBUG', 'INFO', 'WARN', 'ERROR', 'FATAL'].include? level
-          Rails.logger.send(level.downcase.to_sym, message)
+        if message =~ LevelsPattern
+          level = $1
+          JLog.logger(path).send(level.downcase.to_sym, output)
         else
-          Rails.logger.warn('*** Attempt to log with a nonexistent level ***')
-          Rails.logger.warn(message)
+          JLog.logger.warn('*** Attempt to log with a nonexistent level ***')
+          JLog.logger.warn(output)
         end
       end
 

data/config/routes.rb

@@ -2,4 +2,4 @@ Jlog::Engine.routes.draw do
 
   post 'append' => 'ajax#append'
 
-end
+end

data/lib/generators/jlog/install_generator.rb

@@ -10,6 +10,17 @@ module Jlog
       end
     end
 
+    def create_initializer
+      puts "Create Jlog initializer config/initializers/jlog.rb"
+      create_file("config/initializers/jlog.rb") do
+        %Q{require 'jlog-rails'\n
+JLog.configure("/jlog/append") do |config|
+  config.logger = Logger.new(File.join(Rails.root, "log", "jlog_\#\{Rails.env\}.log"))
+end
+}
+      end
+    end
+
     def include_js_file
       append_to_file 'app/assets/javascripts/application.js' do
         %Q{\n//\n//= require jlog}

data/lib/jlog/configuration.rb

@@ -0,0 +1,10 @@
+module JLog
+  class Configuration
+    attr_accessor :logger, :formatter
+
+    def initialize
+      @logger = Rails.logger
+      @formatter = Formatter::Default
+    end
+  end
+end

data/lib/jlog/dsl.rb

@@ -0,0 +1,27 @@
+module JLog
+  module DSL
+    def configure(path = nil, &block)
+      @configurations ||= {}
+      config = Configuration.new
+      @configurations[path] = config
+      block.call(config) if block
+    end
+
+    def get_config(path)
+      return nil unless @configurations or @configurations[path]
+      return @configurations[path]
+    end
+
+    def logger(path)
+      config = get_config(path)
+      return config.logger if config
+      Rails.logger
+    end
+
+    def formatter(path)
+      config = get_config(path)
+      return config.formatter if config
+      Formatter::Default
+    end
+  end
+end

data/lib/jlog/engine.rb

@@ -2,4 +2,4 @@ module Jlog
   class Engine < Rails::Engine
     isolate_namespace Jlog
   end
-end
+end

data/lib/jlog/formatters.rb

@@ -0,0 +1,11 @@
+module JLog
+  module Formatter
+    Default = proc do |params|
+      "#{Time.now} #{params[:path]}: #{params[:message]}"
+    end
+
+    SplunkGenericSingleLine = proc do |params|
+      ([Time.now.strftime("%Y-%m-%dT%H:%M:%S.%3N")] + params.map { |k,v| "#{k}=#{ERB::Util.url_encode(v)}" }).join " "
+    end
+  end
+end

data/lib/jlog/version.rb

@@ -1,3 +1,3 @@
 module Jlog
-  VERSION = '0.0.5'
+  VERSION = '0.1.0'
 end

data/lib/jlog-rails.rb

@@ -1 +1,11 @@
-require "jlog/engine"
+require "erb"
+
+require "jlog/formatters"
+require "jlog/configuration"
+require "jlog/dsl"
+require "jlog/engine"
+require "jlog/version"
+
+module JLog
+  extend DSL
+end

data/vendor/assets/javascripts/jlog.js

@@ -32,7 +32,7 @@
 
 function JLog(name) {
   var _currentLevel = JLog.ALL,
-      _appenders = [new JLog.ConsoleAppender],
+      _appenders = [new JLog.ConsoleAppender()],
       _name = null,
       _enabled = true;
 
@@ -40,6 +40,10 @@ function JLog(name) {
     _name = name || null;
   };
 
+  if (name) {
+    this.setName(name);
+  }
+
   this.addAppender = function(appender) {
     if (appender) {
       _appenders.push(appender);
@@ -80,10 +84,9 @@ function JLog(name) {
         case 'all': _currentLevel = JLog.ALL; break;
         case 'debug': _currentLevel = JLog.DEBUG; break;
         case 'info': _currentLevel = JLog.INFO; break;
+        case 'warn': _currentLevel = JLog.WARN; break;
         case 'error': _currentLevel = JLog.ERROR; break;
         case 'fatal': _currentLevel = JLog.FATAL; break;
-        case 'warn': _currentLevel = JLog.WARN; break;
-        case 'none': // fall through to default
         default: _currentLevel = JLog.NONE;
       }
     } else {
@@ -111,11 +114,7 @@ function JLog(name) {
   this.getLevel = function() {
     return _currentLevel;
   };
-
-  if (name) {
-    this.setName(name);
-  }
-};
+}
 
 JLog.ALL    = 0;
 JLog.DEBUG  = 1;
@@ -180,18 +179,19 @@ JLog.prototype._log = function() {
 JLog.ConsoleAppender = function() {
   this.name = 'ConsoleAppender';
 
-  if(window.console && window.console.log)
-    this.log = function(msg) { window.console.log(msg); }
-  else this.log = function(msg) {};
+  if (window.console && window.console.log)
+    this.log = function(msg) { window.console.log(msg); };
+  else
+    this.log = function(msg) {};
 };
 
 JLog.AjaxAppender = function(url) {
   // Do we make more then 1 call at a time?
-	var waitForResponse = true;
+  var waitForResponse = true;
   // Current buffer of messages
-	var queuedLoggingEvents = [];
+  var queuedLoggingEvents = [];
   // Messages which should be sent
-	var queuedRequests = [];
+  var queuedRequests = [];
   // Maximum count of messages sent at a one time
   var batchSize = 10;
   // Are we currently sending something
@@ -206,23 +206,25 @@ JLog.AjaxAppender = function(url) {
   function sendRequest(postData, callback) {
     $.post(url, postData, "json")
       .complete(function() {
-        if(waitForResponse) sending = false;
+        if (waitForResponse) sending = false;
         if (callback) callback(true);
       });
   }
 
   function sendAllRemaining() {
-    if(queuedLoggingEvents.length == 0) return;
+    if (queuedLoggingEvents.length === 0) return;
     var eventCopy = queuedLoggingEvents;
     queuedLoggingEvents = [];
     queuedRequests.push(eventCopy);
     sendAll();
   }
 
-  function preparePostData(data) { return { message:data }; }
+  function preparePostData(data) {
+    return { message:data };
+  }
 
   function sendAll() {
-    if(waitForResponse && sending) return;
+    if (waitForResponse && sending) return;
     sending = true;
     var currentRequestBatch;
     if (waitForResponse) {
@@ -251,7 +253,7 @@ JLog.AjaxAppender = function(url) {
     log: function(msg) {
       queuedLoggingEvents.push(msg);
       if (queuedLoggingEvents.length >= batchSize) sendAllRemaining();
-      else if(queuedLoggingEvents.length == 1) scheduleSending();
+      else if (queuedLoggingEvents.length == 1) scheduleSending();
     }
-  }
+  };
 };

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jlog-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -43,7 +43,10 @@ files:
 - jlog-rails.gemspec
 - lib/generators/jlog/install_generator.rb
 - lib/jlog-rails.rb
+- lib/jlog/configuration.rb
+- lib/jlog/dsl.rb
 - lib/jlog/engine.rb
+- lib/jlog/formatters.rb
 - lib/jlog/version.rb
 - script/rails
 - vendor/assets/javascripts/jlog.js
@@ -67,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: jlog-rails
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Jlog for Rails