paulbsd/pybl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Config file loading bug

Browse Source 
added /etc as a path
This commit is contained in:
Paul 2016-02-29 10:19:39 +01:00
parent 468655fb3b
commit 6cb0924ffa
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
py-squid-blacklists.py
View File

@ -2,7 +2,7 @@
from pysquidblacklists import * from pysquidblacklists import *
config = PySquidBlacklistsConfig() config = PySquidBlacklistsConfig()
config.get_config() config.get_config(__file__)
bli = PySquidBlacklistsImporter(config) bli = PySquidBlacklistsImporter(config)
bl = PySquidBlacklistsRunner(config, bli) bl = PySquidBlacklistsRunner(config, bli)

13
pysquidblacklists/pysquidblacklists.py
View File

@ -122,8 +122,8 @@ class PySquidBlacklistsConfig:
self.config = configparser.RawConfigParser() self.config = configparser.RawConfigParser()
self.config_path = None self.config_path = None
def get_config(self): def get_config(self, pwd):
self.get_path() self.get_path(pwd)
self.config.read(self.config_path) self.config.read(self.config_path)
self.url = str(self.config.get("main", "url")) self.url = str(self.config.get("main", "url"))
self.filename = self.url.split("/").pop() self.filename = self.url.split("/").pop()
@ -138,11 +138,14 @@ class PySquidBlacklistsConfig:
def set_config(self, section, attr): def set_config(self, section, attr):
self.config.set(section, attr) self.config.set(section, attr)
def get_path(self): def get_path(self, pwd):
filename = "py-squid-blacklists.conf" filename = "py-squid-blacklists.conf"
config_path = "%s/%s" % (os.path.dirname(os.path.abspath(__name__)), filename) config_path = "%s/%s" % (os.path.dirname(os.path.abspath(pwd)), filename)
default_config_path = "/etc/%s" % filename
if os.path.exists(config_path): if os.path.exists(config_path):
self.config_path = config_path self.config_path = config_path
elif os.path.exists(default_config_path):
self.config_path = default_config_path
else: else:
exit("No config file available at common paths. Must initialize it") exit("No config file available at common paths (current dir or /etc). Must initialize it")