mirror of https://github.com/fail2ban/fail2ban
ENH: Use os.path.join for filter/action config readers
parent
b47ea7f813
commit
c95b87c13c
|
@ -27,7 +27,7 @@ __date__ = "$Date$"
|
||||||
__copyright__ = "Copyright (c) 2004 Cyril Jaquier"
|
__copyright__ = "Copyright (c) 2004 Cyril Jaquier"
|
||||||
__license__ = "GPL"
|
__license__ = "GPL"
|
||||||
|
|
||||||
import logging
|
import logging, os
|
||||||
from configreader import ConfigReader, OptionConfigReader
|
from configreader import ConfigReader, OptionConfigReader
|
||||||
|
|
||||||
# Gets the instance of the logger.
|
# Gets the instance of the logger.
|
||||||
|
@ -44,7 +44,7 @@ class ActionReader(OptionConfigReader):
|
||||||
]
|
]
|
||||||
|
|
||||||
def read(self):
|
def read(self):
|
||||||
return ConfigReader.read(self, "action.d/" + self._file)
|
return ConfigReader.read(self, os.path.join("action.d", self._file))
|
||||||
|
|
||||||
def convert(self):
|
def convert(self):
|
||||||
head = ["set", self._name]
|
head = ["set", self._name]
|
||||||
|
|
|
@ -27,7 +27,7 @@ __date__ = "$Date$"
|
||||||
__copyright__ = "Copyright (c) 2004 Cyril Jaquier"
|
__copyright__ = "Copyright (c) 2004 Cyril Jaquier"
|
||||||
__license__ = "GPL"
|
__license__ = "GPL"
|
||||||
|
|
||||||
import logging
|
import logging, os
|
||||||
from configreader import ConfigReader, OptionConfigReader
|
from configreader import ConfigReader, OptionConfigReader
|
||||||
|
|
||||||
# Gets the instance of the logger.
|
# Gets the instance of the logger.
|
||||||
|
@ -41,7 +41,7 @@ class FilterReader(OptionConfigReader):
|
||||||
]
|
]
|
||||||
|
|
||||||
def read(self):
|
def read(self):
|
||||||
return ConfigReader.read(self, "filter.d/" + self._file)
|
return ConfigReader.read(self, os.path.join("filter.d", self._file))
|
||||||
|
|
||||||
def convert(self):
|
def convert(self):
|
||||||
stream = list()
|
stream = list()
|
||||||
|
|
Loading…
Reference in New Issue