Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit b9da9c7, reversing changes made to 9201b28.
eth0izzle · Nov 25, 2017 · 39e94f6 · 39e94f6
1 parent b9da9c7
commit 39e94f6
Show file tree

Hide file tree

Showing 13 changed files with 10 additions and 56 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,4 @@
 .idea
 .virtualenv
 __pycache__
-*.egg-info
-dist/
-build/
-*.pyc
+*.pyc
diff --git a/MANIFEST.in b/MANIFEST.in
diff --git a/needl/data/adjectives.txt → data/adjectives.txt b/needl/data/adjectives.txt → data/adjectives.txt
diff --git a/needl/data/first-names.txt → data/first-names.txt b/needl/data/first-names.txt → data/first-names.txt
diff --git a/needl/data/last-names.txt → data/last-names.txt b/needl/data/last-names.txt → data/last-names.txt
diff --git a/needl/data/nouns.txt → data/nouns.txt b/needl/data/nouns.txt → data/nouns.txt
diff --git a/needl/data/settings.yaml → data/settings.yaml b/needl/data/settings.yaml → data/settings.yaml
diff --git a/needl/data/top-1m.csv → data/top-1m.csv b/needl/data/top-1m.csv → data/top-1m.csv
diff --git a/needl/data/user-agents.txt → data/user-agents.txt b/needl/data/user-agents.txt → data/user-agents.txt
diff --git a/needl/data/verbs.txt → data/verbs.txt b/needl/data/verbs.txt → data/verbs.txt
diff --git a/needl/main.py → needl.py b/needl/main.py → needl.py
@@ -1,16 +1,11 @@
 import os, sys, time, argparse, logging
 import daemon, daemon.pidfile
 import needl, needl.tasks as scheduler
-import pkg_resources
 
 
-DEFAULT_DATADIR = pkg_resources.resource_filename('needl', 'data')
-DEFAULT_CONFFILE = pkg_resources.resource_filename('needl', 'data/settings.yaml')
-
 def main():
     parser = argparse.ArgumentParser(description=needl.__description__)
-    parser.add_argument('--datadir', default=DEFAULT_DATADIR, help='Data directory')
-    parser.add_argument('--config', default=DEFAULT_CONFFILE, help='Configuration file path')
+    parser.add_argument('--datadir', default=os.getcwd() + '/data', help='Data directory')
     parser.add_argument('-d', '--daemon', action='store_true', help='Run as a deamon')
     parser.add_argument('-v', '--verbose', action='store_true', help='Increase logging')
     parser.add_argument('--logfile', type=argparse.FileType('a'), default=sys.stdout, help='Log to this file. Default is stdout.')
@@ -21,10 +16,7 @@ def main():
         args.logfile = open('/tmp/needl.log', 'a')
 
     needl.init(args)
-    if args.daemon:
-        daemonize(args.logfile, args.pidfile)
-    else:
-        start()
+    daemonize(args.logfile, args.pidfile) if args.daemon else start()
 
 
 def daemonize(logfile, pidfile):
@@ -33,7 +25,7 @@ def daemonize(logfile, pidfile):
     with daemon.DaemonContext(working_directory=os.getcwd(),
                               stderr=logfile,
                               umask=0o002,
-                              pidfile=daemon.pidfile.PIDLockFile(pidfile)):
+                              pidfile=daemon.pidfile.PIDLockFile(pidfile)) as dc:
 
         start()
 
@@ -63,3 +55,7 @@ def stop():
 
     logging.shutdown()
     sys.exit()
+
+
+if __name__ == "__main__":
+    main()
diff --git a/needl/__init__.py b/needl/__init__.py
@@ -17,9 +17,9 @@ def init(_args):
     global settings, args
     args = _args
 
-    with open(args.config) as f:
+    with open(args.datadir + '/settings.yaml', 'r') as f:
         settings = yaml.load(f)
 
     logging.basicConfig(stream=args.logfile,
                         level=logging.DEBUG if args.verbose else logging.INFO,
-                        format='(%(levelname)s) [%(module)s->%(funcName)s]: %(message)s')
+                        format='(%(levelname)s) [%(module)s->%(funcName)s]: %(message)s')
diff --git a/setup.py b/setup.py