Permalink
Browse files

server calling changes

  • Loading branch information...
1 parent 0a2c814 commit e12eaabc94799e829b94988d69f6053191348cd6 @e1ven committed Apr 20, 2012
Showing with 6 additions and 5 deletions.
  1. +3 −0 server.py
  2. +3 −5 waymoot.py
View
@@ -172,4 +172,7 @@ def sendmail(self):
finally:
count +=1
print ("This thread has sent " + str(count))
+
+server = Server()
+
View
@@ -13,7 +13,7 @@
from collections import OrderedDict
import shutil
import csv
-import server
+from server import server
class BaseHandler(tornado.web.RequestHandler):
def getvars(self):
@@ -251,10 +251,8 @@ def get(self):
def post(self):
self.getvars()
- s = server()
- def load(self,emails=None,htmltemplate=None,txttemplate=None):
-
- s.load(emails=self.UserSettings['list'],htmltemplate=self.UserSettings['htmltemplate'],txttemplate=self.UserSettings['texttemplate'])
+ server.load(emails=self.UserSettings['list'],htmltemplate=self.UserSettings['htmltemplate'],txttemplate=self.UserSettings['texttemplate'])
+ server.start()
class ListHandler(BaseHandler):

0 comments on commit e12eaab

Please sign in to comment.