From c6f4541be965f551750284cc0ef8edd2afe6a158 Mon Sep 17 00:00:00 2001
From: Scott Kitterman <scott@kitterman.com>
Date: Mon, 12 Feb 2018 12:31:53 -0500
Subject: [PATCH] Use config module

---
 dkimpy_milter/__init__.py | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/dkimpy_milter/__init__.py b/dkimpy_milter/__init__.py
index 36c0cc5..fae2927 100644
--- a/dkimpy_milter/__init__.py
+++ b/dkimpy_milter/__init__.py
@@ -268,11 +268,19 @@ class dkimMilter(Milter.Base):
       return res
 
 if __name__ == "__main__":
-  Milter.factory = dkimMilter
-  Milter.set_flags(Milter.CHGHDRS + Milter.ADDHDRS)
-  global config
-  config = read_config(['dkim-milter.cfg','/etc/mail/dkim-milter.cfg'])
-  miltername = config.miltername
-  socketname = config.socketname
-  sys.stdout.flush()
-  Milter.runmilter(miltername,socketname,240)
+    Milter.factory = dkimpyMilter
+    Milter.set_flags(Milter.CHGHDRS + Milter.ADDHDRS)
+    #global config
+    #config = read_config(['dkim-milter.cfg','/etc/mail/dkim-milter.cfg'])
+    configFile = '/etc/dkimpymilter.conf'
+    if len(sys.argv) > 1:
+        if sys.argv[1] in ( '-?', '--help', '-h' ):
+            print('usage: dkimpy-milter [<configfilename>]')
+            sys.exit(1)
+        configFile = sys.argv[1]
+
+    configGlobal = dkimpy-milter.config._processConfigFile(filename = configFile)
+    miltername = config.miltername
+    socketname = config.socketname
+    sys.stdout.flush()
+    Milter.runmilter(miltername,socketname,240)