commit: ceb58df34110110c37a155c7cd4ce0b25a818799
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 11 12:37:44 2014 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Tue Mar 11 12:37:44 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=ceb58df3
zookeeper cleanup and add log4j config so we get rotated logs by default
---
sys-cluster/zookeeper/Manifest | 3 +-
sys-cluster/zookeeper/files/log4j.properties | 58 ++++++++++++++++++++++++++++
sys-cluster/zookeeper/zookeeper-3.4.5.ebuild | 16 ++++++--
3 files changed, 72 insertions(+), 5 deletions(-)
diff --git a/sys-cluster/zookeeper/Manifest b/sys-cluster/zookeeper/Manifest
index de90671..9d88921 100644
--- a/sys-cluster/zookeeper/Manifest
+++ b/sys-cluster/zookeeper/Manifest
@@ -1,4 +1,5 @@
+AUX log4j.properties 2191 SHA256
bf9df5ca06d8ffd2c11b13f2ea0b78879afab7d05cb2d48603425b50d7dade85 SHA512
a465aef274e3f325730c150fdebe3ca27f9debe723af6680b187daf83d6da663fa8a51bb9813ec8cba3b4d59c9e28848032083a44686b08fd2c246a461ada0c6
WHIRLPOOL
57281e789d6742d3363152b4deac0405ca74448d61c070df7fd4610db7b9a6ba87c58085f66dccabf895b42457512965249807a6247f9f192b4f3eb568c078c1
AUX zookeeper.confd 390 SHA256
12c202a8891a44ac7c19e619320339345f5b2ec0033736601dd334adcd78b472 SHA512
c6b75ce741603e4c2df7dba93fb6207a5955e7bb231ca9098172c17753b8f87a0af2106d4676420d44e6099053f05086bc84c7966b6fe0f9da6e8a541fccf80e
WHIRLPOOL
662648c34c14ad9b58c05c8d1264d3c7fc5b8124f923cdcd09b4c3f2825ad84652e1816d0ed320d894a1cdbba9e64e577a41179a107c7cff14fb440147f2e760
AUX zookeeper.initd 385 SHA256
b654d3e19f72b72652523cecc46fdfecc0e209ee454bfe132fff114294bd453b SHA512
2b18a2f4bae64c2e6c80168c6f02036d9bc6115aba2a94c219fbb20f3808a6c64c493dac552f189d54e7c8b4006dd1c0964dcb1f2cdb7a78222a17400b3de153
WHIRLPOOL
129df8d2a0bc946f78d99e843f5c616395a25e1dbc7b4b4a05c987ddfb946ba083f15dbb547752a21d4cc3888ff65d3e90699f8626a5f46be4c6eaac31a18216
DIST zookeeper-3.4.5.tar.gz 16402010 SHA256
e92b634e99db0414c6642f6014506cc22eefbea42cc912b57d7d0527fb7db132 SHA512
525fbb2af52c06823b6bedaefeb718df6090a3775ead06f3ff1f54b1b3cb752286f568a91b3188444cbdfe26ad8b931e0663cb08b27f23b4e83e8a3cfb6e88a7
WHIRLPOOL
344ea06625f46ef216df93e29d653e8fb0100e83e977c50b59691e30803b0e2d632ba44a1e63f2d82689ddfadba3d6aafce37cd260559185416040bc80f903fa
-EBUILD zookeeper-3.4.5.ebuild 1463 SHA256
15d15a9fb95ed60b8d0a9221926578674354ca9da84d5c793d7c08495a5d344b SHA512
ec0bb4e9933bbf86e4d84eede2eabfe4cbd7fab8e3280b10b540bcf86c474a284768d4acdaa1942691fbc1d08266b19758fb498df2464e23d25699c4c81fa47f
WHIRLPOOL
81cd046b8683b4da0e9f5e9c855eba5b913cd0cf484eac44340c8e3a68fffd3dc412ff3d331b6d144d023cc72b2ae771f155c5b5797fb3031261416e2c5ea000
+EBUILD zookeeper-3.4.5.ebuild 1637 SHA256
39db3a921354579f63e005c4abb7cb581d4f331b8901cdd5c6d9de70d4c1914d SHA512
5b7301d1c8636d73ae851ffc19b3183202e74a8324a7f6d8f3397d39d51e8fe818a319207e80d63ab012be710f5a80800bf6182745236b48834bb3a5815a9c6b
WHIRLPOOL
1247aceab99a9cac23ca15f55cd29333e7cfe4f009ddb3d598b2fcf58631e682d3f447eddfc37fab5d073b03bb15c795188f3a6958176a480d4113c7e12cee8c
diff --git a/sys-cluster/zookeeper/files/log4j.properties
b/sys-cluster/zookeeper/files/log4j.properties
new file mode 100644
index 0000000..c462993
--- /dev/null
+++ b/sys-cluster/zookeeper/files/log4j.properties
@@ -0,0 +1,58 @@
+# Define some default values that can be overridden by system properties
+zookeeper.root.logger=INFO, CONSOLE
+zookeeper.console.threshold=INFO
+zookeeper.log.dir=/var/log/zookeeper/
+zookeeper.log.file=zookeeper.log
+zookeeper.log.threshold=DEBUG
+zookeeper.tracelog.dir=/var/log/zookeeper/
+zookeeper.tracelog.file=zookeeper_trace.log
+
+#
+# ZooKeeper Logging Configuration
+#
+
+# Format is "<default threshold> (, <appender>)+
+
+# DEFAULT: console appender only
+#log4j.rootLogger=${zookeeper.root.logger}
+
+# Example with rolling log file
+log4j.rootLogger=CONSOLE, ROLLINGFILE
+
+# Example with rolling log file and tracing
+#log4j.rootLogger=TRACE, CONSOLE, ROLLINGFILE, TRACEFILE
+
+#
+# Log INFO level and above messages to the console
+#
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.Threshold=${zookeeper.console.threshold}
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d{ISO8601} [myid:%X{myid}] -
%-5p [%t:%C{1}@%L] - %m%n
+
+#
+# Add ROLLINGFILE to rootLogger to get log file output
+# Log DEBUG level and above messages to a log file
+log4j.appender.ROLLINGFILE=org.apache.log4j.RollingFileAppender
+log4j.appender.ROLLINGFILE.Threshold=${zookeeper.log.threshold}
+log4j.appender.ROLLINGFILE.File=${zookeeper.log.dir}/${zookeeper.log.file}
+
+# Max log file size of 256MB
+log4j.appender.ROLLINGFILE.MaxFileSize=256MB
+# uncomment the next line to limit number of backup files
+log4j.appender.ROLLINGFILE.MaxBackupIndex=10
+
+log4j.appender.ROLLINGFILE.layout=org.apache.log4j.PatternLayout
+log4j.appender.ROLLINGFILE.layout.ConversionPattern=%d{ISO8601}
[myid:%X{myid}] - %-5p [%t:%C{1}@%L] - %m%n
+
+
+#
+# Add TRACEFILE to rootLogger to get log file output
+# Log DEBUG level and above messages to a log file
+log4j.appender.TRACEFILE=org.apache.log4j.FileAppender
+log4j.appender.TRACEFILE.Threshold=TRACE
+log4j.appender.TRACEFILE.File=${zookeeper.tracelog.dir}/${zookeeper.tracelog.file}
+
+log4j.appender.TRACEFILE.layout=org.apache.log4j.PatternLayout
+### Notice we are including log4j's NDC here (%x)
+log4j.appender.TRACEFILE.layout.ConversionPattern=%d{ISO8601} [myid:%X{myid}]
- %-5p [%t:%C{1}@%L][%x] - %m%n
diff --git a/sys-cluster/zookeeper/zookeeper-3.4.5.ebuild
b/sys-cluster/zookeeper/zookeeper-3.4.5.ebuild
index 567453c..7375a2a 100644
--- a/sys-cluster/zookeeper/zookeeper-3.4.5.ebuild
+++ b/sys-cluster/zookeeper/zookeeper-3.4.5.ebuild
@@ -20,7 +20,6 @@ DEPEND=""
RDEPEND=">=virtual/jre-1.6"
INSTALL_DIR=/opt/${PN}
-DATA_DIR=/var/lib/${PN}
export CONFIG_PROTECT="${CONFIG_PROTECT} ${INSTALL_DIR}/conf"
pkg_setup() {
@@ -39,20 +38,29 @@ src_compile() {
}
src_install() {
+ local DATA_DIR=/var/lib/${PN}
+
cd "${S}"/src/c || die
emake DESTDIR="${D}" install
cd "${S}" || die
+
+ # cleanup sources
rm -rf src/ || die
rm bin/*.cmd || die
- dodir "${DATA_DIR}"
+ keepdir "${DATA_DIR}"
sed "s:^dataDir=.*:dataDir=${DATA_DIR}:" conf/zoo_sample.cfg >
conf/zoo.cfg || die "sed failed"
+ cp "${FILESDIR}"/log4j.properties conf/ || die "cp log4j conf failed"
dodir "${INSTALL_DIR}"
mv "${S}"/* "${D}${INSTALL_DIR}" || die "install failed"
- keepdir /var/lib/zookeeper
- fowners zookeeper:zookeeper /var/lib/zookeeper
+ # data dir perms
+ fowners zookeeper:zookeeper "${DATA_DIR}"
+
+ # log dir
+ keepdir /var/log/zookeeper
+ fowners zookeeper:zookeeper /var/log/zookeeper
# init script
newinitd "${FILESDIR}"/zookeeper.initd ${PN}
