a new setting has been added that allows to choose whether to update the latest activ...

[osqa.git] / forum_modules / updater / base.py

diff --git a/forum_modules/updater/base.py b/forum_modules/updater/base.py
index d26c2430a02d03e0cf244dd29cd6f03167071f91..c5bac16e01273d214add90e4e61f36f38a57be2b 100644 (file)
--- a/forum_modules/updater/base.py
+++ b/forum_modules/updater/base.py
@@ -13,10 +13,12 @@ import logging
 
 
 from xml.dom.minidom import parse, parseString
 
 
 from xml.dom.minidom import parse, parseString

+from forum.startup import get_database_engine

 from forum.models import Question, User
 from forum.models import Question, User

-from forum.settings import APP_URL, SVN_REVISION
+from forum.settings import APP_URL, SVN_REVISION, APP_TITLE, APP_DESCRIPTION

 from django import VERSION as DJANGO_VERSION
 from django.utils import simplejson
 from django import VERSION as DJANGO_VERSION
 from django.utils import simplejson

+from django.utils.html import escape

 from django.utils.encoding import smart_unicode
 from django.conf import settings as django_settings
 from django.utils.translation import ugettext as _
 from django.utils.encoding import smart_unicode
 from django.conf import settings as django_settings
 from django.utils.translation import ugettext as _


@@ -87,9 +89,13 @@ def check_for_updates():
         admin_emails_xml += '<email value="%s" />' % email
     admin_emails_xml += '</emails>'
 
         admin_emails_xml += '<email value="%s" />' % email
     admin_emails_xml += '</emails>'
 

+    database_type = get_database_engine()
+

     statistics = """<check>
     <key value="%(site_key)s" />
     <app_url value="%(app_url)s" />
     statistics = """<check>
     <key value="%(site_key)s" />
     <app_url value="%(app_url)s" />

+    <app_title value="%(app_title)s" />
+    <app_description value="%(app_description)s" />

     <svn_revision value="%(svn_revision)d" />
     <views value="%(site_views)d" />
     <active_users value="%(active_users)d" />
     <svn_revision value="%(svn_revision)d" />
     <views value="%(site_views)d" />
     <active_users value="%(active_users)d" />


@@ -102,13 +108,15 @@ def check_for_updates():
 </check> """ % {
         'site_key' : settings.SITE_KEY,
         'app_url' : APP_URL,
 </check> """ % {
         'site_key' : settings.SITE_KEY,
         'app_url' : APP_URL,

+        'app_title' : escape(APP_TITLE.value),
+        'app_description' : escape(APP_DESCRIPTION.value),

         'svn_revision' : svn_revision,
         'site_views' : get_site_views(),
         'server_name' : get_server_name(),
         'active_users' : get_active_users(),
         'python_version' : ''.join(sys.version.splitlines()),
         'django_version' : str(DJANGO_VERSION),
         'svn_revision' : svn_revision,
         'site_views' : get_site_views(),
         'server_name' : get_server_name(),
         'active_users' : get_active_users(),
         'python_version' : ''.join(sys.version.splitlines()),
         'django_version' : str(DJANGO_VERSION),

-        'database' : django_settings.DATABASE_ENGINE,
+        'database' : database_type,

         'os' : str(os.uname()),
         'emails' : admin_emails_xml,
     }
         'os' : str(os.uname()),
         'emails' : admin_emails_xml,
     }


@@ -163,4 +171,4 @@ def update_trigger():
         update_status = check_for_updates()
 
         logging.error(smart_unicode("Update process has been triggered: %s" % update_status))
         update_status = check_for_updates()
 
         logging.error(smart_unicode("Update process has been triggered: %s" % update_status))

-
+        settings.LATEST_UPDATE_DATETIME.set_value(now)