Fix OSQA-819: Link to profile in message is wrong if OSQA is installed in a subfolder

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

diff --git a/forum_modules/updates/base.py b/forum_modules/updates/base.py
index 51fcdbe8a23ba18c74f468d25d639d7bf808bfb3..fe7a003dd836e9660b18a6246ae218cba5edda0c 100644 (file)
--- a/forum_modules/updates/base.py
+++ b/forum_modules/updates/base.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+

 import os
 import sys
 import platform
 import os
 import sys
 import platform


@@ -15,10 +17,9 @@ import logging
 
 from xml.dom.minidom import parse, parseString
 from forum.base import get_database_engine
 
 from xml.dom.minidom import parse, parseString
 from forum.base import get_database_engine

-from forum.models import Question, User
-from forum.settings import APP_URL, SVN_REVISION, APP_TITLE, APP_DESCRIPTION
+from forum.models import Question, Answer, Comment, User
+from forum.settings import APP_URL, VCS_REVISION, APP_TITLE, APP_DESCRIPTION

 from django import VERSION as DJANGO_VERSION
 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.html import escape
 from django.utils.encoding import smart_unicode
 from django.conf import settings as django_settings


@@ -80,7 +81,7 @@ def get_admin_emails():
 def check_for_updates():
     # Get the SVN Revision
     try:
 def check_for_updates():
     # Get the SVN Revision
     try:

-        svn_revision = int(SVN_REVISION.replace('SVN-', ''))
+        svn_revision = int(VCS_REVISION.replace('SVN-', ''))

     except ValueError:
         # Here we'll have to find another way of getting the SVN revision
         svn_revision = 0
     except ValueError:
         # Here we'll have to find another way of getting the SVN revision
         svn_revision = 0


@@ -92,13 +93,16 @@ def check_for_updates():
 
     database_type = get_database_engine()
 
 
     database_type = get_database_engine()
 

-    statistics = """<check>
+    statistics = u"""<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" />
     <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" />

+    <questions_count value="%(questions_count)d" />
+    <answers_count value="%(answers_count)d" />
+    <comments_count value="%(comments_count)d" />

     <active_users value="%(active_users)d" />
     <server value="%(server_name)s" />
     <python_version value="%(python_version)s" />
     <active_users value="%(active_users)d" />
     <server value="%(server_name)s" />
     <python_version value="%(python_version)s" />


@@ -114,6 +118,9 @@ def check_for_updates():
         'svn_revision' : svn_revision,
         'site_views' : get_site_views(),
         'server_name' : get_server_name(),
         'svn_revision' : svn_revision,
         'site_views' : get_site_views(),
         'server_name' : get_server_name(),

+        'questions_count' : Question.objects.filter_state(deleted=False).count(),
+        'answers_count' : Answer.objects.filter_state(deleted=False).count(),
+        'comments_count' : Comment.objects.filter_state(deleted=False).count(),

         'active_users' : get_active_users(),
         'python_version' : ''.join(sys.version.splitlines()),
         'django_version' : str(DJANGO_VERSION),
         'active_users' : get_active_users(),
         'python_version' : ''.join(sys.version.splitlines()),
         'django_version' : str(DJANGO_VERSION),


@@ -123,6 +130,7 @@ def check_for_updates():
     }
 
     # Compress the statistics XML dump
     }
 
     # Compress the statistics XML dump

+    statistics = statistics.encode('ascii', 'xmlcharrefreplace')

     statistics_compressed = bz2.compress(statistics)
 
     # Pass the compressed statistics to the update server
     statistics_compressed = bz2.compress(statistics)
 
     # Pass the compressed statistics to the update server


@@ -169,7 +177,10 @@ def update_trigger():
     # Trigger the update process
     now = datetime.datetime.now()
     if (now - settings.LATEST_UPDATE_DATETIME) > datetime.timedelta(days=1):
     # Trigger the update process
     now = datetime.datetime.now()
     if (now - settings.LATEST_UPDATE_DATETIME) > datetime.timedelta(days=1):

-        update_status = check_for_updates()
-
-        logging.error(smart_unicode("Update process has been triggered: %s" % update_status))
-        settings.LATEST_UPDATE_DATETIME.set_value(now)
+        try:
+            update_status = check_for_updates()
+            logging.log(logging.INFO, smart_unicode("Update process has been triggered: %s" % update_status))
+        except Exception, e:
+            logging.errror(smart_unicode(e))
+        finally:
+            settings.LATEST_UPDATE_DATETIME.set_value(now)