Merge branch 'envfix' into 'master'

[sensorfw] Use a socket env path if set. Fixes MER#1709 This makes this work in case of confinement (think snappy or flatpack) if the usual paths are not writeable. See merge request !8
sailfishos · Dec 2, 2016 · 2095755 · 2095755
2 parents d5bbbb9 + f57c72c
commit 2095755
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/core/sensormanager.cpp b/core/sensormanager.cpp
@@ -109,7 +109,7 @@ SensorManager::SensorManager()
     deviation(0)
 {
     QString pluginPath;
-    QByteArray env = qgetenv("SENSORFW_LIBRARY_PATH");
+    QByteArray env = qgetenv("SENSORFW_SOCKET_PATH");
     const char* SOCKET_NAME;
     if (env.isEmpty())
         SOCKET_NAME = "/var/run/sensord.sock";

diff --git a/qt-api/socketreader.cpp b/qt-api/socketreader.cpp
@@ -50,7 +50,14 @@ bool SocketReader::initiateConnection(int sessionId)
     }
 
     socket_ = new QLocalSocket(this);
-    socket_->connectToServer("/var/run/sensord.sock", QIODevice::ReadWrite);
+    QByteArray env = qgetenv("SENSORFW_SOCKET_PATH");
+    const char* SOCKET_NAME;
+    if (env.isEmpty())
+        SOCKET_NAME = "/var/run/sensord.sock";
+    else
+        SOCKET_NAME = env+"/var/run/sensord.sock";
+
+    socket_->connectToServer(SOCKET_NAME, QIODevice::ReadWrite);
 
     if (!(socket_->serverName().size())) {
         qDebug() << socket_->errorString();