etsy · Jan 5, 2015 · Jan 5, 2015 · Jan 5, 2015
Showing with 9 additions and 25 deletions.

+1 −12 README.md

+5 −13 bin/logster

+3 −0 setup.py
diff --git a/README.md b/README.md
@@ -34,18 +34,7 @@ our engineers to write log parsers quickly.
 
 ## Installation
 
-Logster depends on the "logtail" utility that can be obtained from the logcheck
-package, either from a Debian package manager or from source:
-
-    http://packages.debian.org/source/sid/logcheck
-
-RPMs for logcheck can be found here:
-
-    http://rpmfind.net/linux/rpm2html/search.php?query=logcheck
-
-Once you have logtail installed via the logcheck package, you make want to look
-over the actual logster script itself to adjust any paths necessary. Then the
-only other thing you need to do is run the installation commands from the
+Then the only thing you need to do is run the installation commands from the
 `setup.py` file:
 
     $ sudo python setup.py install

diff --git a/bin/logster b/bin/logster
@@ -51,6 +51,7 @@ import fcntl
 import socket 
 import traceback
 import platform
+import pygtail
 
 from time import time, strftime, gmtime
 from math import floor
@@ -60,7 +61,6 @@ from logster.logster_helper import LogsterParsingException, LockingError, CloudW
 
 # Globals
 gmetric = "/usr/bin/gmetric"
-logtail = "/usr/sbin/logtail2"
 log_dir = "/var/log/logster"
 state_dir = "/var/run"
 send_nsca = "/usr/sbin/send_nsca"
@@ -70,8 +70,6 @@ script_start_time = time()
 # Command-line options and parsing.
 cmdline = optparse.OptionParser(usage="usage: %prog [options] parser logfile",
     description="Tail a log file and filter each line to generate metrics that can be sent to common monitoring packages.")
-cmdline.add_option('--logtail', action='store', default=logtail,
-                    help='Specify location of logtail.  Default %s' % logtail)
 cmdline.add_option('--metric-prefix', '-p', action='store',
                     help='Add prefix to all published metrics. This is for people that may multiple instances of same service on same host.',
                     default='')
@@ -142,8 +140,6 @@ if class_name.find('.') == -1:
 log_file   = arguments[1]
 state_dir  = options.state_dir
 log_dir    = options.log_dir
-logtail    = options.logtail
-
 
 # Logging infrastructure for use throughout the script.
 # Uses appending log file, rotated at 100 MB, keeping 5.
@@ -363,7 +359,6 @@ def main():
     dirsafe_logfile = log_file.replace('/','-')
     logtail_state_file = '%s/logtail-%s%s.state' % (state_dir, class_name, dirsafe_logfile)
     logtail_lock_file  = '%s/logtail-%s%s.lock' % (state_dir, class_name, dirsafe_logfile)
-    shell_tail = "%s -f %s -o %s" % (logtail, log_file, logtail_state_file)
 
     logger.info("Executing parser %s on logfile %s" % (class_name, log_file))
     logger.debug("Using state file %s" % logtail_state_file)
@@ -398,24 +393,21 @@ def main():
 
         except OSError as e:
             logger.info('Writing new state file and exiting. (Was either first run, or state file went missing.)')
-            input = os.popen(shell_tail)
-            retval = input.close()
-            if not retval is None:
-                logger.warning('%s returned bad exit code %s' % (shell_tail, retval))
+            input = pygtail.Pygtail(log_file, offset_file=logtail_state_file).readlines()
             end_locking(lockfile, logtail_lock_file)
             sys.exit(0)
 
         # Open a pipe to read input from logtail.
-        input = os.popen(shell_tail)
+        input = pygtail.Pygtail(log_file, logtail_state_file)
 
     except SystemExit as e:
         raise
 
     except Exception as e:
         # note - there is no exception when logtail doesn't exist.
         # I don't know when this exception will ever actually be triggered.
-        print("Failed to run %s to get log data (line %s): %s" %
-               (shell_tail, lineno(), e))
+        print ("Failed to get log data (line %s): %s" %
+               (lineno(), e))
         end_locking(lockfile, logtail_lock_file)
         sys.exit(1)
 

diff --git a/setup.py b/setup.py
@@ -16,6 +16,9 @@
         'logster',
         'logster/parsers'
     ],
+    install_requires = [
+        'pygtail==0.5.1'
+    ],
     zip_safe=False,
     scripts=[
         'bin/logster'