Fixed file logging mechanism bug. Added prefix_length restriction

diff --git a/.gitignore b/.gitignore
index fe78d1e..0f5a3eb 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 settings.py
 *.pyc
 celerybeat-schedule
-celery_jobs.log
+*.log

diff --git a/flowspec/forms.py b/flowspec/forms.py
index 4536361..d2d6cc8 100644 (file)
--- a/flowspec/forms.py
+++ b/flowspec/forms.py
@@ -7,6 +7,7 @@ from flowspy.flowspec.models import *
 from ipaddr import *
 from django.core.urlresolvers import reverse
 from django.contrib.auth.models import User
+from django.conf import settings
 import datetime
 
 
@@ -43,12 +44,20 @@ class RouteForm(forms.ModelForm):
 
     def clean_destination(self):
         data = self.cleaned_data['destination']
+        error = None
         if data:
             try:
                 address = IPNetwork(data)
+                if address.prefixlen < settings.PREFIX_LENGTH:
+                    error = "Currently no prefix lengths < %s are allowed" %settings.PREFIX_LENGTH
+                    raise forms.ValidationError('error')
                 return self.cleaned_data["destination"]
             except Exception:
-                raise forms.ValidationError('Invalid network address format')
+                if error:
+                    error_text = error
+                else:
+                    error_text = 'Invalid network address format'
+                raise forms.ValidationError(error_text)
     
     def clean_expires(self):
         date = self.cleaned_data['expires']

diff --git a/flowspec/tasks.py b/flowspec/tasks.py
index 70b4b01..35a52bc 100644 (file)
--- a/flowspec/tasks.py
+++ b/flowspec/tasks.py
@@ -9,9 +9,9 @@ from django.conf import settings
 
 import os
 
-cwd = os.getcwd()
 
-LOG_FILENAME = os.path.join(cwd, 'log/celery_jobs.log')
+
+LOG_FILENAME = os.path.join(settings.LOG_FILE_LOCATION, 'celery_jobs.log')
 
 #FORMAT = '%(asctime)s %(levelname)s: %(message)s'
 #logging.basicConfig(format=FORMAT)

diff --git a/flowspec/views.py b/flowspec/views.py
index be2a85f..e328ced 100644 (file)
--- a/flowspec/views.py
+++ b/flowspec/views.py
@@ -37,8 +37,7 @@ import os
 cwd = os.getcwd()
     
 
-LOG_FILENAME = os.path.join(cwd, 'log/celery_jobs.log')
-
+LOG_FILENAME = os.path.join(settings.LOG_FILE_LOCATION, 'celery_jobs.log')
 #FORMAT = '%(asctime)s %(levelname)s: %(message)s'
 #logging.basicConfig(format=FORMAT)
 formatter = logging.Formatter('%(asctime)s %(levelname)s: %(message)s')

diff --git a/log/celery_jobs.log b/log/celery_jobs.log
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/settings.py.dist b/settings.py.dist
index 6a8f6d0..00cbf43 100644 (file)
--- a/settings.py.dist
+++ b/settings.py.dist
@@ -1,14 +1,20 @@
 # Django settings for flowspy project.
 
+import os
+import djcelery
+djcelery.setup_loader()
+from celery.schedules import crontab
+
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
 ADMINS = (
-    # ('Your Name', 'your_email@domain.com'),
+    ('Admin', 'admin_mail@admin.ad'),
 )
 
-import djcelery
-djcelery.setup_loader()
+
+here = lambda x: os.path.join(os.path.abspath(os.path.dirname(__file__)), x)
+
 
 
 MANAGERS = ADMINS
@@ -139,13 +145,14 @@ INSTALLED_APPS = (
 
 LOGIN_URL = '/fod/welcome'
 
-CACHE_BACKEND = "memcached://127.0.0.1:11211/?timeout=600"
+CACHE_BACKEND = "memcached://127.0.0.1:11211/?timeout=3600"
 
 AUTH_PROFILE_MODULE = 'accounts.UserProfile'
 
 NETCONF_DEVICE = ""
 NETCONF_USER = ""
 NETCONF_PASS = ""
+
 ROUTES_FILTER = "<configuration><routing-options><flow/></routing-options></configuration>"
 ROUTE_FILTER = "<configuration><routing-options><flow><route><name>%s</name></route></flow></routing-options></configuration>"
 COMMIT_CONFIRMED_TIMEOUT = "120"
@@ -164,7 +171,13 @@ CELERY_CONCURRENCY = 1
 CELERY_IMPORTS = ("flowspec.tasks", )
 
 SERVER_EMAIL = "noreply@grnet.gr"
-EMAIL_SUBJECT_PREFIX = "[fod] "
+EMAIL_SUBJECT_PREFIX = "[FoD] "
+
+LOG_FILE_LOCATION = here("log")
+
+EXPIRATION_NOTIFY_DAYS = 4
+PREFIX_LENGTH = 32 
+POLL_SESSION_UPDATE = 60.0
 
 BROKER_URL = "beanstalk://localhost:11300//"
 
@@ -172,13 +185,11 @@ SHIB_AUTH_AFFILIATION = 'urn:mace:grnet.gr:pki:user'
 SHIB_ADMIN_DOMAIN = 'grnet.gr'
 SHIB_LOGOUT_URL = 'https://netdev.grnet.gr/Shibboleth.sso/Logout'
 
-from celery.schedules import crontab
-
 CELERYBEAT_SCHEDULE = {
     # Executes every day at 01:35 AM 
     "every-day-sync": {
         "task": "flowspec.tasks.check_sync",
-        "schedule": crontab(minute=35, hour=01),
+        "schedule": crontab(minute=01, hour=01),
         "args": (),
     },
 }

diff --git a/utils/proxy.py b/utils/proxy.py
index 38a2b7d..9257c3d 100644 (file)
--- a/utils/proxy.py
+++ b/utils/proxy.py
@@ -10,7 +10,7 @@ import os
 cwd = os.getcwd()
     
 
-LOG_FILENAME = os.path.join(cwd, 'log/celery_jobs.log')
+LOG_FILENAME = os.path.join(settings.LOG_FILE_LOCATION, 'celery_jobs.log')
 
 #FORMAT = '%(asctime)s %(levelname)s: %(message)s'
 #logging.basicConfig(format=FORMAT)