omloga 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,4 @@
 ---
-SHA1:
-  metadata.gz: e1a09f1d37411cdfb8dc303ab7c8350b18478ac6
-  data.tar.gz: 64f016732252292f3accb2fa332a545047c24073
 SHA512:
-  metadata.gz: 90acbdb13e3fdb2437d8833129706f299bf6ba05a4b518392a788df1da6df64cf7871a4a6ec3dde4ff39de6780aa00976a1f893a4f4034ad8613b71e39ac1e30
-  data.tar.gz: ec3bc730f68597bc073f13ecf34cb5629b9c3ccb3a0a9a1a797cc5615581c5da3bbde6450ac1603462d4ed6d9f703c2f3afe5c40de4da51f87195e37e8845765
+  metadata.gz: b2fcace5055ab4a67e6138c39ef8c885a5ea2bee233e68c35d9ac9d1c7aecebdf2ae99b0bab7615ea8f37339aaa83ab9eff79b652ca605bed2bcb5314a95bad5
+  data.tar.gz: f73538cf307963df1f77abf2f4f37fc1c73d590b6f88fc4e0df12892f40a0f7515f2d82f9978d0b064d0816543c7b3bc66d638fee2fbd24a258ab56b6384d15d

data/README.md

@@ -2,3 +2,6 @@ omloga
 ======
 
 A Ruby on Rails log parser and stitcher.
+
+
+[![Gem Version](https://badge.fury.io/rb/omloga.png)](http://badge.fury.io/rb/omloga)

data/lib/omloga.rb

@@ -1,4 +1,4 @@
-require 'moped'
+require 'mongo'
 require 'optparse'
 require 'ostruct'
 require 'omloga/request'
@@ -39,8 +39,8 @@ def omloga(args)
     exit
   end
 
-  def db_session
-    $DB_SESSION
+  def db_client
+    $DB_CLIENT
   end
 
   def logs_collection
@@ -51,8 +51,9 @@ def omloga(args)
     $REQUEST_HASH
   end
 
-  $DB_SESSION = Moped::Session.connect(options.dburi)
-  $DB_LOGS_COLLECTION = db_session[options.collection]
+  $DB_CLIENT = Mongo::Client.new(options.dburi)
+  db_client.logger.level = Logger::INFO
+  $DB_LOGS_COLLECTION = db_client[options.collection]
   $REQUEST_HASH = {}
   $LOG_FILE = args[0]
 
@@ -87,6 +88,15 @@ def omloga(args)
     end
   end
 
+  def get_uuid(line)
+    match_data = line.match(/([a-f\d]{8}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{12})/)
+    if match_data
+      return match_data[1]
+    else
+      return nil
+    end
+  end
+
   line_count = 0
   request_count = 0
   lines_skipped = 0
@@ -99,16 +109,23 @@ def omloga(args)
   end
 
   File.foreach($LOG_FILE) do |log_line|
+    log_line.strip!
     pid = get_pid(log_line)
-    req = request_hash[pid]
+    uuid = get_uuid(log_line)
+    req = request_hash[uuid]
+    if uuid == nil
+      lines_skipped += 1
+      skipped_lines.print log_line if log_skip
+      next
+    end 
 
     if is_start_line?(log_line)
       if req
         req.add_start_line(log_line)
         req.count+= 1
       else
-        req = Omloga::Request.new(pid, log_line)
-        request_hash[pid] = req
+        req = Omloga::Request.new(uuid, pid, log_line)
+        request_hash[uuid] = req
       end
     else
       unless req
@@ -123,8 +140,8 @@ def omloga(args)
         req.complete_count+= 1
 
         if req.complete_count >= req.count
-          logs_collection.find(req.id_doc).upsert(req.mongo_doc)
-          request_hash.delete(pid)
+          logs_collection.find(req.id_doc).update_one(req.mongo_doc, {upsert: true})
+          request_hash.delete(uuid)
           request_count+= req.count
         end
       else

data/lib/omloga/request.rb

@@ -1,13 +1,14 @@
 #encoding: utf-8
 
-require 'moped'
+require 'mongo'
 
 module Omloga
   class Request
-    attr_accessor :id, :pid, :saved, :lines, :count, :complete_count, :path, :status, :created_at, :updated_at
+    attr_accessor :id, :uuid, :pid, :saved, :lines, :count, :complete_count, :path, :status, :created_at, :updated_at
 
-    def initialize(pid, start_line)
-      @id = Moped::BSON::ObjectId.new
+    def initialize(uuid, pid, start_line)
+      @id = BSON::ObjectId.new
+      @uuid = uuid
       @pid = pid
       @saved = false
       @count = 1
@@ -31,11 +32,12 @@ module Omloga
     def mongo_doc
       obj = {
         '_id' => id,
+        'uuid' => uuid,
         'pid' => pid,
         'count' => count,
         'path' => path,
         'status' => status,
-        'lines' => lines.join("")
+        'lines' => lines
       }
 
       if saved

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: omloga
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Srirang G Doddihal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-07 00:00:00.000000000 Z
+date: 2020-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: moped
+  name: mongo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 2.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 2.6.4
 description: Stitches together log lines of every request and inserts them as one
   record in MongoDB for easier analysis
 email: saferanga-rubygems@yahoo.com
@@ -32,10 +32,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/omloga.rb
-- lib/omloga/request.rb
 - README.md
 - bin/omloga
+- lib/omloga.rb
+- lib/omloga/request.rb
 homepage: http://rubygems.org/gems/omloga
 licenses:
 - MIT
@@ -46,17 +46,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.5.3
 signing_key: 
 specification_version: 4
 summary: A Ruby on Rails log parser and stitcher.