Use a logger

This commit is contained in:
nemunaire 2014-08-14 12:49:38 +02:00
commit d0b1336d07
14 changed files with 118 additions and 77 deletions

View file

@ -67,7 +67,7 @@ class Prompt:
(f,d) = self.HOOKS_CAPS[toks[0]]
return f(d, toks, context, self)
else:
print ("Unknown command: `%s'" % toks[0])
print("Unknown command: `%s'" % toks[0])
return ""
def getPS1(self):
@ -88,7 +88,7 @@ class Prompt:
line = sys.stdin.readline()
if len(line) <= 0:
line = "quit"
print ("quit")
print("quit")
cmds = self.lex_cmd(line.strip())
for toks in cmds:
try:
@ -97,7 +97,7 @@ class Prompt:
exc_type, exc_value, exc_traceback = sys.exc_info()
traceback.print_exception(exc_type, exc_value, exc_traceback)
except KeyboardInterrupt:
print ("")
print("")
return ret != "quit"

View file

@ -16,9 +16,12 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import logging
import os
import xmlparser
logger = logging.getLogger(__name__)
def end(toks, context, prompt):
"""Quit the prompt for reload or exit"""
if toks[0] == "refresh":
@ -66,11 +69,11 @@ def load_file(filename, context):
if context.addServer(server, config["nick"],
config["owner"], config["realname"],
server.hasAttribute("ssl")):
print (" Server `%s:%s' successfully added."
% (server["server"], server["port"]))
logger.info("Server `%s:%s' successfully added."
% (server["server"], server["port"]))
else:
print (" Server `%s:%s' already added, skiped."
% (server["server"], server["port"]))
logger.warn("Server `%s:%s' already added, skiped."
% (server["server"], server["port"]))
# Load files asked by the configuration file
for load in config.getNodes("load"):