fix: some bugs

Laisky · Nov 7, 2017 · e8787a8 · e8787a8
1 parent c08ced7
commit e8787a8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/ramjet/__main__.py b/ramjet/__main__.py
@@ -36,10 +36,10 @@ def setup_args():
 
 def setup_options():
     opt.set_option('email_sender',
-        EmailSender(host=settings.MAIL_HOST,
-                    port=settings.MAIL_PORT,
-                    username=settings.MAIL_USERNAME,
-                    passwd=settings.MAIL_PASSWD))
+                   EmailSender(host=settings.MAIL_HOST,
+                               port=settings.MAIL_PORT,
+                               username=settings.MAIL_USERNAME,
+                               passwd=settings.MAIL_PASSWD))
 
 
 def main():
@@ -68,7 +68,7 @@ def main():
         web.run_app(app, host='localhost', port=opt.PORT)
     except Exception:
         logger.exception('ramjet got error:')
-        email_sender.send_email(
+        opt.email_sender.send_email(
             mail_to=settings.MAIL_TO_ADDRS,
             mail_from=settings.MAIL_FROM_ADDR,
             subject='ramjet error',

diff --git a/ramjet/tasks/__init__.py b/ramjet/tasks/__init__.py
@@ -1,4 +1,5 @@
 import os
+import pathlib
 import importlib
 
 from kipp.options import opt
@@ -15,7 +16,7 @@
 
 
 def setup_webapp(app):
-    app.router.add_static('/static', os.path.join(settings.CWD, 'tasks', 'static'), show_index=True)
+    app.router.add_static('/static', pathlib.Path(settings.CWD, 'tasks', 'static').absolute(), show_index=True)
 
 
 def setup_tasks(app):

diff --git a/ramjet/utils/__init__.py b/ramjet/utils/__init__.py
@@ -18,6 +18,7 @@
 from .jinja import debug_wrapper, TemplateRendering
 from .mail import send_mail
 from .encrypt import generate_token, validate_token, generate_passwd, validate_passwd
+from .db import get_conn
 
 
 UTC = pytz.timezone('utc')