Changes: Lock files moved from /tmp to /var/run.

RevBy: Juha Lintula
pull/1/head
Antti Kervinen 15 years ago
parent 540677445f
commit 23bad7dbda

@ -357,7 +357,7 @@ This can be achieved by adding --single-instance to the invoker command:
\endverbatim \endverbatim
As a result, a lock file As a result, a lock file
\c /tmp/single-instance-locks/\<application_name\>/instance.lock is created. \c /var/run/single-instance-locks/\<application_name\>/instance.lock is created.
If applauncherd cannot acquire the lock, it tries to find the corresponding If applauncherd cannot acquire the lock, it tries to find the corresponding
window and activates it. window and activates it.

1
debian/changelog vendored

@ -1,6 +1,7 @@
applauncherd (0.25.1) unstable; urgency=low applauncherd (0.25.1) unstable; urgency=low
* Fixes: NB#241927 - QML boosted applications have incorrect MApplication::objectName * Fixes: NB#241927 - QML boosted applications have incorrect MApplication::objectName
* Lock file moved to /var/run
-- Jussi Lind <jussi.lind@nokia.com> Thu, 31 Mar 2011 17:13:21 +0300 -- Jussi Lind <jussi.lind@nokia.com> Thu, 31 Mar 2011 17:13:21 +0300

@ -114,7 +114,7 @@ bool Daemon::lock()
fl.l_start = 0; fl.l_start = 0;
fl.l_len = 1; fl.l_len = 1;
if((m_lockFd = open("/tmp/applauncherd.lock", O_WRONLY | O_CREAT, 0666)) == -1) if((m_lockFd = open("/var/run/applauncherd.lock", O_WRONLY | O_CREAT, 0666)) == -1)
return false; return false;
if(fcntl(m_lockFd, F_SETLK, &fl) == -1) if(fcntl(m_lockFd, F_SETLK, &fl) == -1)

@ -178,7 +178,7 @@ This can be achieved by adding --single-instance to the invoker command:
Name=com.nokia.<application_name> Name=com.nokia.<application_name>
Exec=/usr/bin/invoker --single-instance --type=d /usr/bin/<application_name> Exec=/usr/bin/invoker --single-instance --type=d /usr/bin/<application_name>
As a result, a lock file /tmp/single-instance-locks/<application_name>/instance.lock As a result, a lock file /var/run/single-instance-locks/<application_name>/instance.lock
is created. If applauncherd cannot acquire the lock, it tries to find the is created. If applauncherd cannot acquire the lock, it tries to find the
corresponding window and activates it. corresponding window and activates it.

@ -36,7 +36,7 @@
namespace namespace
{ {
int g_lockFd = -1; int g_lockFd = -1;
const std::string LOCK_PATH_BASE("/tmp/single-instance-locks/"); const std::string LOCK_PATH_BASE("/var/run/single-instance-locks/");
const std::string LOCK_FILE_NAME("instance.lock"); const std::string LOCK_FILE_NAME("instance.lock");
} }
@ -238,7 +238,7 @@ extern "C"
* \brief Try to acquire a lock file. * \brief Try to acquire a lock file.
* *
* Tries to acquire a lock currently at * Tries to acquire a lock currently at
* /tmp/single-instance-locks/[binaryName]/instance.lock * /var/run/single-instance-locks/[binaryName]/instance.lock
* *
* \param binaryName Full path to the binary. * \param binaryName Full path to the binary.
* \return true if succeeded, false on failure. * \return true if succeeded, false on failure.

@ -28,7 +28,7 @@ def remove_applauncherd_runtime_files():
Removes files that applauncherd leaves behind after it has been stopped Removes files that applauncherd leaves behind after it has been stopped
""" """
debug("Removing files that applauncherd leaves behind after it has been stopped") debug("Removing files that applauncherd leaves behind after it has been stopped")
files = ['/tmp/applauncherd.lock'] files = ['/var/run/applauncherd.lock']
files += glob.glob('/tmp/boost*') files += glob.glob('/tmp/boost*')
for f in files: for f in files:

@ -28,7 +28,7 @@ def remove_applauncherd_runtime_files():
Removes files that applauncherd leaves behind after it has been stopped Removes files that applauncherd leaves behind after it has been stopped
""" """
files = ['/tmp/applauncherd.lock'] files = ['/var/run/applauncherd.lock']
files += glob.glob('/tmp/boost*') files += glob.glob('/tmp/boost*')
for f in files: for f in files:

Loading…
Cancel
Save