fixed urls for dispatchers for django 1.10

server/src/uds/core/util/modfinder.py

@@ -53,13 +53,13 @@ def loadModulesUrls():
             pkgpath = os.path.dirname(sys.modules[modName].__file__)
             for _, name, _ in pkgutil.iter_modules([pkgpath]):
                 fullModName = '%s.%s.urls' % (modName, name)
-                mod = __import__(fullModName, globals(), locals(), ['urlpatterns'], -1)
                 try:
+                    mod = __import__(fullModName, globals(), locals(), ['urlpatterns'], -1)
                     patterns += mod.urlpatterns
                 except:
-                    logger.info('Module {0} has no url patterns'.format(mod))
+                    logger.exception('Loading patterns')
         except Exception, e:
-            logger.debug(e)
+            logger.exception('Processing dispatchers loading')
             pass
 
     return patterns

server/src/uds/dispatchers/__init__.py

@@ -40,7 +40,11 @@ def __init__():
     # Dinamycally import children of this package. The __init__.py files must register, if needed, inside ServiceProviderFactory
     pkgpath = os.path.dirname(sys.modules[__name__].__file__)
     for _, name, _ in pkgutil.iter_modules([pkgpath]):
-        __import__(name, globals(), locals(), [], -1)
+        try:
+            logger.info('Loading dispatcher {}'.format(name))
+            __import__(name, globals(), locals(), [], -1)
+        except:
+            logger.exception('Loading dispatcher {}'.format(name))
 
     logger.debug('Dispatchers initialized')
 

server/src/uds/dispatchers/guacamole/urls.py

@@ -32,9 +32,9 @@
 '''
 from __future__ import unicode_literals
 
-from django.conf.urls import patterns
+from django.conf.urls import url
+from .views import guacamole
 
-
-urlpatterns = patterns(__package__,
-    (r'^guacamole/(?P<tunnelId>.+)$', 'views.guacamole'),
-    )
+urlpatterns = [
+    url(r'^guacamole/(?P<tunnelId>.+)$', guacamole, name='dispatcher.guacamole'),
+]

server/src/uds/dispatchers/pam/urls.py

@@ -32,8 +32,9 @@
 '''
 from __future__ import unicode_literals
 
-from django.conf.urls import patterns
+from django.conf.urls import url
+from .views import pam
 
-urlpatterns = patterns(__package__,
-     (r'^pam$', 'views.pam'),
-    )
+urlpatterns = [
+    url(r'^pam$', pam, name='dispatcher.pam'),
+]