git commit: TS-1724: Add tool to compare records.config files to contrib

[so...@apache.org]

Updated Branches:
  refs/heads/master 02eb936fe -> 630983580


TS-1724: Add tool to compare records.config files to contrib


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/63098358
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/63098358
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/63098358

Branch: refs/heads/master
Commit: 63098358054c1e605c42f71815dd7a6a4ab85e56
Parents: 02eb936
Author: Mark Harrison <ma...@mivok.net>
Authored: Sun Mar 24 17:23:28 2013 -0400
Committer: Phil Sorber <so...@apache.org>
Committed: Sun Mar 24 17:23:28 2013 -0400

----------------------------------------------------------------------
 CHANGES                                  |    3 +
 contrib/python/compare_records_config.py |   67 +++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/63098358/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 4212088..760d532 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
   Changes with Apache Traffic Server 3.3.2
 
 
+  *) [TS-1724] Add tool to compare records.config files to contrib
+   Author: Mark Harrison <ma...@mivok.net>
+
   *) [TS-1566] dynamic update for string vars does not work
    Author: Aidan McGurn <ai...@openwave.com>
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/63098358/contrib/python/compare_records_config.py
----------------------------------------------------------------------
diff --git a/contrib/python/compare_records_config.py b/contrib/python/compare_records_config.py
new file mode 100644
index 0000000..a8283a3
--- /dev/null
+++ b/contrib/python/compare_records_config.py
@@ -0,0 +1,67 @@
+#!/usr/bin/env python
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Compares two records.config files, printing which items are different and
+# what the before/after values are.
+# Ignores FLOAT differences and @foo@ values from the source code defaults.
+import sys
+
+def parse_records_file(filename):
+    fh = open(filename)
+    settings = {}
+    for line in fh:
+        line = line.strip()
+        if line.startswith('CONFIG') or line.startswith('LOCAL'):
+            parts = line.split()
+            if parts[2] == 'FLOAT':
+                parts[3] = parts[3].rstrip('0')
+            if parts[2] == 'INT' and parts[3][-1] in 'KMG':
+                unit = parts[3][-1]
+                val = parts[3][:-1]
+                if unit == 'K':
+                    val = int(val) * 1024
+                if unit == 'M':
+                    val = int(val) * 1048576
+                if unit == 'G':
+                    val = int(val) * 1073741824
+                parts[3] = str(val)
+            try:
+                settings[parts[1]] = parts[3]
+            except IndexError:
+                sys.stderr.write("Skipping malformed line: %s\n" % line)
+                continue
+    return settings
+
+def compare_settings(old, new):
+    for key in sorted(tuple(set(old) | set(new))):
+        if key not in old:
+            old[key] = "missing"
+        if key not in new:
+            new[key] = "missing"
+
+    for key in sorted(old):
+        if old[key].startswith('@') and old[key].endswith('@'):
+            # Skip predefined values
+            continue
+        if old[key] != new[key]:
+            print "%s %s -> %s" % (key, old[key], new[key])
+
+if __name__ == '__main__':
+    settings_orig = parse_records_file(sys.argv[1])
+    settings_new = parse_records_file(sys.argv[2])
+    compare_settings(settings_orig, settings_new)