removing from top level dir. in favor of monitor/ module dir.

[monitor.git] / mailer.py

diff --git a/mailer.py b/mailer.py
index f2af6cf..46fdcae 100755 (executable)
--- a/mailer.py
+++ b/mailer.py
@@ -7,14 +7,12 @@
 # $Id: mailer.py,v 1.10 2007/08/08 13:28:06 soltesz Exp $
 from emailTxt import *
 import smtplib
-from config import config
+import config
 import calendar
 import logging
 import os
 import time
-import monitorconfig
 
-config = config()
 logger = logging.getLogger("monitor")
 
 MTA="localhost"
@@ -29,11 +27,11 @@ def reformat_for_rt(text):
                
 
 def _setupRTenvironment():
-       os.environ['PATH'] = os.environ['PATH'] + ":" + monitorconfig.RT_WEB_TOOLS_PATH
-       os.environ['RTSERVER'] = monitorconfig.RT_WEB_SERVER
-       os.environ['RTUSER']   = monitorconfig.RT_WEB_USER
-       os.environ['RTPASSWD'] = monitorconfig.RT_WEB_PASSWORD
-       os.environ['RTDEBUG'] = monitorconfig.RT_WEB_DEBUG
+       os.environ['PATH'] = os.environ['PATH'] + ":" + config.RT_WEB_TOOLS_PATH
+       os.environ['RTSERVER'] = config.RT_WEB_SERVER
+       os.environ['RTUSER']   = config.RT_WEB_USER
+       os.environ['RTPASSWD'] = config.RT_WEB_PASSWORD
+       os.environ['RTDEBUG'] = config.RT_WEB_DEBUG
        return
 
 def setTicketStatus(ticket_id, status):
@@ -172,7 +170,7 @@ def closeTicketViaRT(ticket_id, comment):
        return
 
 def emailViaRT(subject, text, to, ticket_id=None):
-       if ticket_id == None or ticket_id == "":
+       if ticket_id == None or ticket_id == "" or ticket_id == 0:
                print "No TICKET"
                return emailViaRT_NoTicket(subject, text, to)