add option to disable log rotation

Author: jiehanzheng

README.md

@@ -30,7 +30,7 @@ Usage
 ```
 usage: squid2radius.py [-h] [-p RADIUS_ACCT_PORT]
                        [--radius-nasid RADIUS_NASID] [--squid-path SQUID_PATH]
-                       [--exclude-pattern EXCLUDE_PATTERN]
+                       [--exclude-pattern EXCLUDE_PATTERN] [--no-rotation]
                        logfile_path radius_server radius_secret
 ```
 
@@ -48,6 +48,10 @@ You should also read [SquidFaq/SquidLogs](http://wiki.squid-cache.org/SquidFaq/S
 
 If for some reason you need to prevent usage information of certain user from being sent to the RADIUS server, there is an argument for that!  Use `--exclude-pattern="(girl|boy)friend"` and squid2radius won't send usage of either your `girlfriend` or `boyfriend` to the RADIUS server.
 
+### --no-rotation
+
+By default squid2radius calls `squid -k rotate` to make squid rotate your log files right after we are done counting usage data, in order to ensure usage data accuracy by not counting any log lines more than once next time you run it.  If this is troublesome in your setup, you can add `--no-rotation` argument to disable this behavior.
+
 Note
 ----
 

squid2radius.py

@@ -11,17 +11,19 @@
 
 
 parser = argparse.ArgumentParser(description='Analyze squid log by user ' \
-                                             'and upload result to RADIUS serv')
+                                             'and upload result to RADIUS ' \
+                                             'server.')
 parser.add_argument('logfile_path', help='logfile to analyze')
 parser.add_argument('radius_server')
 parser.add_argument('radius_secret')
 parser.add_argument('-p', '--radius-acct-port', default='1813')
 parser.add_argument('--radius-nasid', default='squid')
 parser.add_argument('--squid-path', default='/usr/sbin/squid')
-parser.add_argument('--exclude-pattern', default='', help='do not send to ' \
-                                                          'server if ' \
-                                                          'username contains '\
-                                                          'this regexp')
+parser.add_argument('--exclude-pattern', help='do not send to server if ' \
+                                              'username contains this regexp',
+                                         default='')
+parser.add_argument('--no-rotation', help='do not rotate squid log files',
+                                     action='store_true')
 args = parser.parse_args()
 
 
@@ -94,7 +96,7 @@
   sys.stdout.write(".\n")
   sys.stdout.flush()
 
-
-print "\nRotating squid log..."
-call([args.squid_path, "-k", "rotate"])
+if not args.no_rotation:
+  print "\nRotating squid log..."
+  call([args.squid_path, "-k", "rotate"])