Merge branch 'master' into 3196-common-url_for

Conflicts:
	ckan/plugins/interfaces.py

ckan/config/environment.py

@@ -251,17 +251,9 @@ def update_config():
     # CONFIGURATION OPTIONS HERE (note: all config options will override
     # any Pylons config options)
 
-    # for postgresql we want to enforce utf-8
-    sqlalchemy_url = config.get('sqlalchemy.url', '')
-    if sqlalchemy_url.startswith('postgresql://'):
-        extras = {'client_encoding': 'utf8'}
-    else:
-        extras = {}
-
-    engine = sqlalchemy.engine_from_config(config, 'sqlalchemy.', **extras)
-
-    if not model.meta.engine:
-        model.init_model(engine)
+    # Initialize SQLAlchemy
+    engine = sqlalchemy.engine_from_config(config, client_encoding='utf8')
+    model.init_model(engine)
 
     for plugin in p.PluginImplementations(p.IConfigurable):
         plugin.configure(config)

ckan/config/resource_formats.json

@@ -69,7 +69,7 @@
   ["TAR", "TAR Compressed File", "application/x-tar", []],
   ["PNG", "PNG Image File", "image/png", []],
   ["RSS", "RSS feed", "application/rss+xml", []],
-  ["GeoJSON", "Geographic JavaScript Object Notation", null, []],
+  ["GeoJSON", "Geographic JavaScript Object Notation", "application/geo+json", ["geojson"]],
   ["SHP", "Shapefile", null, ["esri shapefile"]],
   ["TORRENT", "Torrent", "application/x-bittorrent", ["bittorrent"]],
   ["ICS", "iCalendar", "text/calendar", ["ifb", "iCal"]],

ckan/lib/jobs.py

@@ -28,6 +28,7 @@
 
 from ckan.lib.redis import connect_to_redis
 from ckan.common import config
+from ckan.config.environment import load_environment
 
 
 log = logging.getLogger(__name__)
@@ -249,3 +250,9 @@ def handle_exception(self, job, *exc_info):
         log.exception(u'Job {} on worker {} raised an exception: {}'.format(
                       job.id, self.key, exc_info[1]))
         return super(Worker, self).handle_exception(job, *exc_info)
+
+    def main_work_horse(self, job, queue):
+        # This method is called in a worker's work horse process right
+        # after forking.
+        load_environment(config[u'global_conf'], config)
+        return super(Worker, self).main_work_horse(job, queue)