Browse Source

Cutelyst no sudo (#2612)

Daniel Nicoletti 8 years ago
parent
commit
415643e2fc

+ 1 - 1
frameworks/C++/cutelyst/config.sh

@@ -46,7 +46,7 @@ sed -i "s|SendDate=.*|SendDate=${SEND_DATE}|g" ${CROOT}/config.ini
 export LD_LIBRARY_PATH=/opt/qt${QT_VERSION_MM}/lib:${CROOT}/lib/x86_64-linux-gnu/
 
 if [ -n "${UWSGI}" ]; then
-  uwsgi --ini ${CROOT}/config.ini --cutelyst-app ${CROOT}/benchmarks/src/libcutelyst_benchmarks.so ${PROCESS_OR_THREAD} $MAX_THREADS &
+  uwsgi --ini ${CROOT}/config.ini --plugin ${CROOT}/lib/uwsgi/plugins/cutelyst_plugin.so --cutelyst-app ${CROOT}/benchmarks/src/libcutelyst_benchmarks.so ${PROCESS_OR_THREAD} $MAX_THREADS &
 else
   ${CROOT}/bin/cutelyst-wsgi --ini ${CROOT}/config.ini -a ${CROOT}/benchmarks/src/libcutelyst_benchmarks.so ${PROCESS_OR_THREAD} $MAX_THREADS --socket-timeout 0 &
 fi

+ 0 - 1
frameworks/C++/cutelyst/config/config.ini

@@ -14,7 +14,6 @@ http-socket = :8080
 ;thunder-lock
 ; used by uwsgi_stop.ini
 pidfile = /tmp/uwsgi.pid
-plugin = cutelyst
 
 [Cutelyst]
 Driver=

+ 0 - 1
frameworks/C++/cutelyst/config/config_socket.ini

@@ -17,7 +17,6 @@ chmod-socket = 666
 ;thunder-lock
 ; used by uwsgi_stop.ini
 pidfile = /tmp/uwsgi.pid
-plugin = cutelyst
 
 [Cutelyst]
 Driver=

+ 5 - 1
toolset/setup/linux/frameworks/cutelyst.sh

@@ -34,7 +34,11 @@ fw_untar v$CUTELYST_VER.tar.gz
 cd cutelyst-$CUTELYST_VER
 mkdir build && cd build
 
-cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$CROOT -DUSE_JEMALLOC=on
+cmake .. \
+-DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_INSTALL_PREFIX=$CROOT \
+-DUWSGI_PLUGINS_DIR=${CROOT}/lib/uwsgi/plugins \
+-DUSE_JEMALLOC=on
 
 make -j $MAX_THREADS && sudo make install