diff --git a/lingvodoc-desktop.ini b/lingvodoc-desktop.ini new file mode 100644 index 000000000..9f9476cdd --- /dev/null +++ b/lingvodoc-desktop.ini @@ -0,0 +1,95 @@ +### +# app configuration +# http://docs.pylonsproject.org/projects/pyramid/en/1.5-branch/narr/environment.html +### + +[app:main] +use = egg:lingvodoc + +secret = 'no secrets since its local' + +pyramid.reload_templates = true +pyramid.debug_authorization = false +pyramid.debug_notfound = false +pyramid.debug_routematch = false +pyramid.default_locale_name = en +pyramid.includes = + pyramid_tm + +sqlalchemy.url = postgresql+psycopg2://postgres@/lingvodoc + +# By default, the toolbar only appears for clients from IP addresses +# '127.0.0.1' and '::1'. +# debugtoolbar.hosts = 127.0.0.1 ::1 + +### +# wsgi server configuration +### + +[server:main] +use = egg:waitress#main +host = localhost +port = 6543 + +### +# logging configuration +# http://docs.pylonsproject.org/projects/pyramid/en/1.5-branch/narr/logging.html +### + +[loggers] +keys = root, lingvodoc, sqlalchemy + +[handlers] +keys = console, filelog + +[formatters] +keys = generic + +[logger_root] +level = DEBUG +handlers = console, filelog + +[logger_lingvodoc] +level = DEBUG +handlers = +qualname = lingvodoc + +[logger_sqlalchemy] +level = WARN +handlers = +qualname = sqlalchemy.engine +# "level = INFO" logs SQL queries. +# "level = DEBUG" logs SQL queries and results. +# "level = WARN" logs neither. (Recommended for production systems.) + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[handler_filelog] +class = FileHandler +args = ('%(here)s\\lingvodoc.log','a') +level = DEBUG +formatter = generic + +[formatter_generic] +format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s + +[app:accounts] +use = egg:lingvodoc + +[backend:storage] +# disk or openstack +type = disk +path = OBJECTS_PATH +prefix = http://localhost:6543/ +static_route = objects/ + +[app:desktop] + +desktop = true + +#while beta +central_server = http://ld2alpha.at.ispras.ru/ diff --git a/lingvodoc/queue/mock/celery.py b/lingvodoc/queue/mock/celery.py index 8f0cc17b0..0a567216e 100644 --- a/lingvodoc/queue/mock/celery.py +++ b/lingvodoc/queue/mock/celery.py @@ -1,5 +1,5 @@ __author__ = 'alexander' -from multiprocessing import Process +from multiprocess import Process class MockResult: """ diff --git a/server-requirements.txt b/server-requirements.txt index 733f091ba..d8720e3ae 100644 --- a/server-requirements.txt +++ b/server-requirements.txt @@ -9,6 +9,7 @@ dogpile.cache==0.6.2 kombu==3.0.37 Mako==1.0.4 MarkupSafe==0.23 +multiprocess==0.70.4 numpy==1.11.2 passlib==1.6.5 PasteDeploy==1.5.2 @@ -32,7 +33,7 @@ tgt==1.4.2 transaction==1.6.1 translationstring==1.3 venusian==1.0 -waitress==1.0.1 +waitress==0.9.0 WebOb==1.6.2 zope.deprecation==4.1.2 zope.interface==4.3.2