[1/5] git commit: Core: Do not overide log file when running as a daemon

[mf...@apache.org]

Core: Do not overide log file when running as a daemon

The -L/--log option is ignored when you run Deltacloud
in 'daemon' mode (-d). This cause Deltacloud to log into
syslog even user specify the log file location explicately.


Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/d3be9856
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/d3be9856
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/d3be9856

Branch: refs/heads/master
Commit: d3be9856d7715d20b4eea3c44fe3a0517dcbb37e
Parents: d0353f7
Author: Michal Fojtik <mf...@redhat.com>
Authored: Thu Feb 21 13:40:13 2013 +0100
Committer: Michal fojtik <mf...@redhat.com>
Committed: Thu Feb 21 13:40:13 2013 +0100

----------------------------------------------------------------------
 server/bin/deltacloudd |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d3be9856/server/bin/deltacloudd
----------------------------------------------------------------------
diff --git a/server/bin/deltacloudd b/server/bin/deltacloudd
index e0ac8a4..8cb8702 100755
--- a/server/bin/deltacloudd
+++ b/server/bin/deltacloudd
@@ -231,7 +231,9 @@ else
     argv_opts << [ "--daemonize", "--user", options[:user] || 'nobody', "--tag", "deltacloud-#{ENV['API_DRIVER']}"]
     argv_opts << [ "--pid", options[:pid]] if options[:pid]
     argv_opts << [ "--group", options[:group] || 'nobody' ]
-    argv_opts << [ "--log", File.join(options[:logdir], "#{ENV['API_DRIVER']}.log")]
+    unless ENV['API_LOG']
+      argv_opts << [ "--log", File.join(options[:logdir], "#{ENV['API_DRIVER']}.log")]
+    end
   end
   argv_opts.flatten!