You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ms...@apache.org on 2019/06/27 14:55:49 UTC

[cassandra] branch cassandra-3.0 updated: Update log directory patch for deb package

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

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


The following commit(s) were added to refs/heads/cassandra-3.0 by this push:
     new dc23631  Update log directory patch for deb package
dc23631 is described below

commit dc23631ab17c2c0cc21b05732f905bb23cb67682
Author: Michael Shuler <ms...@apache.org>
AuthorDate: Thu Jun 27 09:49:43 2019 -0500

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

diff --git a/debian/patches/002cassandra_logdir_fix.dpatch b/debian/patches/002cassandra_logdir_fix.dpatch
old mode 100644
new mode 100755
index 87387b9..5e76b91
--- a/debian/patches/002cassandra_logdir_fix.dpatch
+++ b/debian/patches/002cassandra_logdir_fix.dpatch
@@ -6,21 +6,21 @@
 
 @DPATCH@
 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' cassandra~/bin/cassandra cassandra/bin/cassandra
---- cassandra~/bin/cassandra	2015-10-27 14:35:22.000000000 -0500
-+++ cassandra/bin/cassandra	2015-10-27 14:41:38.000000000 -0500
-@@ -139,7 +139,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"
+--- cassandra~/bin/cassandra	2019-06-27 09:35:32.000000000 -0500
++++ cassandra/bin/cassandra	2019-06-27 09:43:28.756343141 -0500
+@@ -127,7 +127,7 @@
+ fi
  
-     if [ "x$pidpath" != "x" ]; then
+ if [ -z "$CASSANDRA_LOG_DIR" ]; then
+-  CASSANDRA_LOG_DIR=$CASSANDRA_HOME/logs
++  CASSANDRA_LOG_DIR=/var/log/cassandra
+ fi
+ 
+ # Special-case path variables.
 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' cassandra~/conf/cassandra-env.sh cassandra/conf/cassandra-env.sh
---- cassandra~/conf/cassandra-env.sh	2015-10-27 14:40:39.000000000 -0500
-+++ cassandra/conf/cassandra-env.sh	2015-10-27 14:42:40.647449856 -0500
-@@ -204,7 +204,7 @@
+--- cassandra~/conf/cassandra-env.sh	2019-06-27 09:35:32.000000000 -0500
++++ cassandra/conf/cassandra-env.sh	2019-06-27 09:42:25.747715490 -0500
+@@ -122,7 +122,7 @@
  esac
  
  #GC log path has to be defined here because it needs to access CASSANDRA_HOME


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