moved daemon log into cache dir so it only has to contend with 1 set …

…of directory permissions. added a conditional check of if is running as root. Will no longer attempt to change the permissions of files unless it is running as root
CodeMeme · Jul 27, 2011 · e06d1ed · e06d1ed
1 parent 867dcbe
commit e06d1ed
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/DependencyInjection/CodeMemeDaemonExtension.php b/DependencyInjection/CodeMemeDaemonExtension.php
@@ -54,7 +54,7 @@ private function getDefaultConfig($name, $container)
             'appName'               => $name,
             'appDir'                => $container->getParameter('kernel.root_dir'),
             'appDescription'        => 'CodeMeme System Daemon',
-            'logLocation'           => $container->getParameter('kernel.logs_dir') . '/' . $container->getParameter('kernel.environment'). '.' . $name . '.daemon.log',
+            'logLocation'           => $container->getParameter('kernel.cache_dir') . '/'. $name . '/' . $container->getParameter('kernel.environment'). '.' . $name . '.daemon.log',
             'authorName'            => 'CodeMeme',
             'authorEmail'           => 'symfony2.kernel@127.0.0.1',
             'appPidLocation'        => $container->getParameter('kernel.cache_dir') . '/'. $name . '/' . $name . '.daemon.pid',

diff --git a/System/Daemon.php b/System/Daemon.php
@@ -1310,14 +1310,16 @@ static protected function _summon()
         }
 
         // Change identity. maybe
-        $c = self::_changeIdentity(
-            self::opt('appRunAsGID'),
-            self::opt('appRunAsUID')
-        );
-        if (false === $c) {
-            self::crit('Unable to change identity');
-            if (self::opt('appDieOnIdentityCrisis')) {
-                self::emerg('Cannot continue after this');
+        if (0 === exec("id -u")) {
+            $c = self::_changeIdentity(
+                self::opt('appRunAsGID'),
+                self::opt('appRunAsUID')
+                );
+            if (false === $c) {
+                self::crit('Unable to change identity');
+                if (self::opt('appDieOnIdentityCrisis')) {
+                    self::emerg('Cannot continue after this');
+                }
             }
         }