[cassandra] branch trunk updated: Update log directory patch for 4.0 deb package

[ms...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mshuler pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 61b77ac  Update log directory patch for 4.0 deb package
61b77ac is described below

commit 61b77ac2b01098776a1bea15a775701230028514
Author: Michael Shuler <ms...@apache.org>
AuthorDate: Wed Jun 26 14:30:39 2019 -0500

    Update log directory patch for 4.0 deb package
    
    Patch by Michael Shuler; Reviewed by Jon Haddad for CASSANDRA-15185
---
 debian/patches/cassandra_logdir_fix.diff | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/patches/cassandra_logdir_fix.diff b/debian/patches/cassandra_logdir_fix.diff
index d75553c..8597331 100644
--- a/debian/patches/cassandra_logdir_fix.diff
+++ b/debian/patches/cassandra_logdir_fix.diff
@@ -1,14 +1,14 @@
 --- a/bin/cassandra
 +++ b/bin/cassandra
-@@ -171,7 +171,7 @@
-     props="$3"
-     class="$4"
-     cassandra_parms="-Dlogback.configurationFile=logback.xml"
--    cassandra_parms="$cassandra_parms -Dcassandra.logdir=$CASSANDRA_HOME/logs"
-+    cassandra_parms="$cassandra_parms -Dcassandra.logdir=/var/log/cassandra"
-     cassandra_parms="$cassandra_parms -Dcassandra.storagedir=$cassandra_storagedir"
+@@ -109,7 +109,7 @@
+ fi
+ 
+ if [ -z "$CASSANDRA_LOG_DIR" ]; then
+-  CASSANDRA_LOG_DIR=$CASSANDRA_HOME/logs
++  CASSANDRA_LOG_DIR=/var/log/cassandra
+ fi
  
-     if [ "x$pidpath" != "x" ]; then
+ # Special-case path variables.
 --- a/conf/cassandra-env.sh
 +++ b/conf/cassandra-env.sh
 @@ -93,16 +93,16 @@


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org