Add greplog. Fixes gh-516

1) server.get_log(); server.seek_once(msg) -- since we get log object
2) server.logfile_pos.seek_once(msg) -- since the start of server

test/box/print.result

@@ -4,17 +4,22 @@ print("Hello, world")
 io = require('io')
 ---
 ...
-local f = require('fiber').create(function() print('Ehllo, world') io.flush() end)
+local f = require('fiber').create(
+    function()
+        print('Ehllo, world')
+        io.flush()
+    end
+)
 ---
 ...
 require('fiber').sleep(0.1)
 ---
 ...
-Check log line
+Check log line (Hello):
 ---
-- "line contains 'Hello'" 
+- "logfile contains "Hello""
 ...
-Check log line
+Check log line (Ehllo):
 ---
-- "line contains 'Ehllo'" 
+- "logfile contains "Ehllo""
 ...

test/box/print.test.py

@@ -4,32 +4,31 @@ import sys
 import os
 import re
 
+log = server.get_log()
 
 admin('print("Hello, world")')
 admin("io = require('io')")
 
-log = server.logfile
-f = open(log, "r")
-f.seek(0, 2)
-
-admin("local f = require('fiber').create(function() print('Ehllo, world') io.flush() end)")
+admin("""local f = require('fiber').create(
+    function()
+        print('Ehllo, world')
+        io.flush()
+    end
+)""")
 admin("require('fiber').sleep(0.1)")
-line = f.readline()
-print("Check log line")
-print("---")
-found = re.search(r'(Hello)', line)
-if found and re.search(r'(Hello)', line).start(1) >= 0:
-    print("""- "line contains 'Hello'" """)
-    print("...")
-else:
-    print('String "%s" does not contain "Hello"' % line)
 
-line = f.readline()
-print("Check log line")
-print("---")
-if re.search('(Ehllo)', line):
-    print("""- "line contains 'Ehllo'" """)
+print("Check log line (Hello):")
+print('---')
+if log.seek_once('Hello') >= 0:
+    print('- "logfile contains "Hello""')
 else:
-    print("""- "line doesn't contain 'Ehllo'" """)
-print("...")
+    print('- "logfile does not contain "Hello""')
+print('...')
 
+print("Check log line (Ehllo):")
+print('---')
+if log.seek_once('Ehllo') >= 0:
+    print('- "logfile contains "Ehllo""')
+else:
+    print('- "logfile does not contain "Ehllo""')
+print('...')

test/box/xlog.test.py

@@ -89,7 +89,7 @@ lsn += 1
 #
 # wal_inprogress = os.path.join(server.vardir, "00000000000000000006.xlog.inprogress")
 # wal = os.path.join(server.vardir, "00000000000000000006.xlog")
-# 
+#
 # os.symlink(abspath("box/empty.xlog"), wal_inprogress)
 # server.start()
 #
@@ -101,16 +101,16 @@ lsn += 1
 # # Empty (header only, no records) inprogress xlog must be deleted
 # # during recovery.
 # """
-# 
+#
 # # If the previous test has failed, there is a dangling link
 # # and symlink fails.
 # try:
 #   os.symlink(abspath("box/just_header.xlog"), wal_inprogress)
 # except OSError as e:
 #   print e
-# 
+#
 # server.start()
-# 
+#
 # if not os.access(wal_inprogress, os.F_OK) and not os.access(wal, os.F_OK):
 #    print "00000000000000000006.xlog.inprogress has been successfully deleted"
 # server.stop()
@@ -118,16 +118,16 @@ lsn += 1
 # print """
 # # Inprogress xlog with bad record must be deleted during recovery.
 # """
-# 
+#
 # # If the previous test has failed, there is a dangling link
 # # and symlink fails.
 # try:
 #   os.symlink(abspath("box/bad_record.xlog"), wal_inprogress)
 # except OSError as e:
 #   print e
-# 
+#
 # server.start()
-# 
+#
 # if not os.access(wal_inprogress, os.F_OK) and not os.access(wal, os.F_OK):
 #    print "00000000000000000006.xlog.inprogress has been successfully deleted"
 
@@ -177,20 +177,13 @@ if os.access(wal, os.F_OK):
     os.unlink(wal)
     os.rename(wal_old, wal)
 
-f = open(server.logfile, "r")
-f.seek(0, 2)
 
 server.start()
-
-check="Duplicate key"
-print "check log line for '%s'" % check
+line = 'Duplicate key'
+print "check log line for '%s'" % line
 print
-line = f.readline()
-while line:
-    if re.search(r'(%s)' % check, line):
-        print "'%s' exists in server log" % check
-        break
-    line = f.readline()
+if server.logfile_pos.seek_once(line) >= 0:
+    print "'%s' exists in server log" % line
 print
 
 server.admin("box.space['test']:get{1}")
@@ -222,16 +215,13 @@ server.stop()
 
 # Remove xlog with {3, 'third tuple'}
 os.unlink(wal)
+
 server.start()
-check="ignoring missing WAL"
-print "check log line for '%s'" % check
+line="ignoring missing WAL"
+print "check log line for '%s'" % line
 print
-line = f.readline()
-while line:
-    if re.search(r'(%s)' % check, line):
-        print "'%s' exists in server log" % check
-        break
-    line = f.readline()
+if server.logfile_pos.seek_once(line) >= 0:
+    print "'%s' exists in server log" % line
 print
 
 # missing tuple from removed xlog

test/lib/tarantool_server.py

@@ -18,7 +18,6 @@ import subprocess
 import collections
 import os.path
 
-
 try:
     from cStringIO import StringIO
 except ImportError:
@@ -122,6 +121,21 @@ class TarantoolLog(object):
             with open(self.path, 'r') as f:
                 f.seek(0, os.SEEK_END)
                 self.log_begin = f.tell()
+        return self
+
+    def seek_once(self, msg):
+        if not os.path.exists(self.path):
+            return -1
+        with open(self.path, 'r') as f:
+            f.seek(self.log_begin, os.SEEK_SET)
+            while True:
+                log_str = f.readline()
+
+                if not log_str:
+                    return -1
+                pos = log_str.find(msg)
+                if pos != -1:
+                    return pos
 
     def seek_from(self, msg, proc=None):
         while True:
@@ -275,8 +289,7 @@ class TarantoolServer(Server):
         return self._logfile_pos
     @logfile_pos.setter
     def logfile_pos(self, val):
-        self._logfile_pos = TarantoolLog(val)
-        self._logfile_pos.positioning()
+        self._logfile_pos = TarantoolLog(val).positioning()
 
     @property
     def script(self):
@@ -613,3 +626,6 @@ class TarantoolServer(Server):
         version = p.stdout.read().rstrip()
         p.wait()
         return version
+
+    def get_log(self):
+        return TarantoolLog(self.logfile).positioning()

test/replication/cluster.test.py

@@ -16,21 +16,14 @@ server.admin("box.info.server.uuid")
 
 # Check log message
 server.stop()
-f = open(server.logfile, "r")
-f.seek(0, 2)
 server.start()
 
-check="server uuid changed to " + new_uuid
-print "check log line for '%s'" % check
+line = "server uuid changed to " + new_uuid
+print "check log line for '%s'" % line
 print
-line = f.readline()
-while line:
-    if re.search(r'(%s)' % check, line):
-        print "'%s' exists in server log" % check
-        break
-    line = f.readline()
+if server.logfile_pos.seek_once(line) >= 0:
+    print "'%s' exists in server log" % line
 print
-f.close()
 server.admin("box.info.server.uuid")
 
 # Check that new UUID has been saved in snapshot