[core] Add note about threaded option and Oracle databases

xiaorong919 · Jun 10, 2014 · 553faf6 · 553faf6
1 parent 9ec6187
commit 553faf6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/desktop/conf.dist/hue.ini b/desktop/conf.dist/hue.ini
@@ -278,15 +278,15 @@
           # The username attribute in the LDAP schema
           ## group_name_attr=cn
 
-  # Configuration options for specifying the Desktop Database.  For more info,
-  # see http://docs.djangoproject.com/en/1.1/ref/settings/#database-engine
+  # Configuration options for specifying the Desktop Database. For more info,
+  # see http://docs.djangoproject.com/en/1.4/ref/settings/#database-engine
   # ------------------------------------------------------------------------
   [[database]]
     # Database engine is typically one of:
-    # postgresql_psycopg2, mysql, or sqlite3
+    # postgresql_psycopg2, mysql, sqlite3 or oracle.
     #
-    # Note that for sqlite3, 'name', below is a filename;
-    # for other backends, it is the database name.
+    # Note that for sqlite3, 'name', below is a path to the filename. For other backends, it is the database name.
+    # Note for Oracle, options={'threaded':true} must be set in order to avoid crashes.
     ## engine=sqlite3
     ## host=
     ## port=

diff --git a/desktop/conf/pseudo-distributed.ini.tmpl b/desktop/conf/pseudo-distributed.ini.tmpl
@@ -285,15 +285,15 @@
           # The username attribute in the LDAP schema
           ## group_name_attr=cn
 
-  # Configuration options for specifying the Desktop Database.  For more info,
-  # see http://docs.djangoproject.com/en/1.1/ref/settings/#database-engine
+  # Configuration options for specifying the Desktop Database. For more info,
+  # see http://docs.djangoproject.com/en/1.4/ref/settings/#database-engine
   # ------------------------------------------------------------------------
   [[database]]
     # Database engine is typically one of:
-    # postgresql_psycopg2, mysql, or sqlite3
+    # postgresql_psycopg2, mysql, sqlite3 or oracle.
     #
-    # Note that for sqlite3, 'name', below is a filename;
-    # for other backends, it is the database name.
+    # Note that for sqlite3, 'name', below is a a path to the filename. For other backends, it is the database name.
+    # Note for Oracle, options={'threaded':true} must be set in order to avoid crashes.
     ## engine=sqlite3
     ## host=
     ## port=

diff --git a/desktop/core/src/desktop/conf.py b/desktop/core/src/desktop/conf.py
@@ -225,7 +225,7 @@ def default_from_email():
 DATABASE = ConfigSection(
   key='database',
   help=_("""Configuration options for specifying the Desktop Database.
-          For more info, see http://docs.djangoproject.com/en/1.1/ref/settings/#database-engine"""),
+          For more info, see http://docs.djangoproject.com/en/1.4/ref/settings/#database-engine"""),
   members=dict(
     ENGINE=Config(
       key='engine',