Attachment 182001 Details for Bug 218814 – v1 patch incomplete

[patch] v1 patch incomplete

graylog.diff (text/plain), 3.79 KB, created by Dave Cottlehuber on 2017-04-22 14:13:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Cottlehuber

Created: 2017-04-22 14:13:04 UTC

Size: 3.79 KB

patch

obsolete

>Index: sysutils/graylog/Makefile
>===================================================================
>--- sysutils/graylog/Makefile	(revision 439143)
>+++ sysutils/graylog/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	graylog
>-PORTVERSION=	2.2.2
>+PORTVERSION=	2.2.3
> CATEGORIES=	sysutils java
> MASTER_SITES=	https://packages.graylog2.org/releases/graylog/ \
> 		http://packages.graylog2.org/releases/graylog/
>Index: sysutils/graylog/distinfo
>===================================================================
>--- sysutils/graylog/distinfo	(revision 439143)
>+++ sysutils/graylog/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1488634660
>-SHA256 (graylog-2.2.2.tgz) = 46f419d422f6e5816b29333c8510524f1bbc910d6bf00136adb3899a985fceb4
>-SIZE (graylog-2.2.2.tgz) = 99956086
>+TIMESTAMP = 1492723318
>+SHA256 (graylog-2.2.3.tgz) = 3de01e7cb8ebc02a7f06cec1c88eded3b717762447bf1b56bff8744f7f5ea80b
>+SIZE (graylog-2.2.3.tgz) = 99971278
>Index: sysutils/graylog/files/graylog.in
>===================================================================
>--- sysutils/graylog/files/graylog.in	(revision 439143)
>+++ sysutils/graylog/files/graylog.in	(working copy)
>@@ -61,44 +61,54 @@
> : ${graylog_dir:="%%DATADIR%%"}
> : ${graylog_data_dir:="%%GRAYLOG_DATA_DIR%%"}
> : ${graylog_run_dir:="/var/run/graylog"}
>-: ${graylog_log_file:="/var/log/graylog-server.log"}
>+: ${graylog_log_file:="/var/log/graylog/server.log"}
> 
>+java_options=" \
>+    -Djava.awt.headless=true \
>+    -Djava.net.preferIPv4Stack=true \
>+    -Dapp=${name} \
>+    -Dlog4j.configurationFile=${graylog_log_file} \
>+    -Xms${graylog_min_mem} \
>+    -Xmx${graylog_max_mem} \
>+    -XX:-OmitStackTraceInFastThrow \
>+    -XX:+AggressiveOpts \
>+    -XX:+CMSClassUnloadingEnabled \
>+    -XX:+CMSConcurrentMTEnabled \
>+    -XX:+CMSParallelRemarkEnabled \
>+    -XX:+DisableExplicitGC \
>+    -XX:+HeapDumpOnOutOfMemoryError \
>+    -XX:+ResizeTLAB \
>+    -XX:+UseCMSInitiatingOccupancyOnly \
>+    -XX:+UseCompressedOops \
>+    -XX:+UseConcMarkSweepGC \
>+    -XX:+UseFastAccessorMethods \
>+    -XX:+UseParNewGC \
>+    -XX:CMSInitiatingOccupancyFraction=75 \
>+    -XX:NewRatio=1 \
>+    "
> 
>-java_options=" -Xms${graylog_min_mem} \
>-               -Xmx${graylog_max_mem} \
>-               -XX:NewRatio=1 \
>-               -XX:+ResizeTLAB \
>-               -XX:+UseConcMarkSweepGC \
>-               -XX:+CMSConcurrentMTEnabled \
>-               -XX:+CMSClassUnloadingEnabled \
>-               -XX:+UseParNewGC \
>-               -XX:-OmitStackTraceInFastThrow"
>+app_pidfile="${graylog_run_dir}/${name}.pid"
>+pidfile="${graylog_run_dir}/daemon.pid"
>+command="/usr/sbin/daemon"
> 
>-start_precmd="graylog_precmd"
>+command_args=" \
>+    -c \
>+    -t ${name} \
>+    -r \
>+    -p ${app_pidfile} \
>+    -P ${pidfile} \
>+    %%LOCALBASE%%/bin/java \
>+    ${java_options} \
>+    -jar ${graylog_dir}/graylog.jar server \
>+    --configfile ${graylog_config}"
> 
>-pidfile="${graylog_run_dir}/${name}.pid"
>-command=/usr/bin/nohup
>+required_files="%%LOCALBASE%%/bin/java ${graylog_config}"
> 
>-command_args="%%LOCALBASE%%/bin/java -jar ${graylog_dir}/graylog.jar server \
>-              --configfile \"${graylog_config}\" \
>-              --pidfile \"${pidfile}\" \
>-              >> \"${graylog_log_file}\" \
>-              2>> \"${graylog_log_file}\" &"
>-
> graylog_precmd() {
>-    if [ ! -f "${graylog_config}" ]; then
>-        echo "Configuration file ${graylog_config} not found"
>-        exit 1
>-    fi
>-
>-    if [ ! -f "${graylog_log_file}" ]; then
>-        touch "${graylog_log_file}"
>-        chown "${graylog_user}:${graylog_group}" "${graylog_log_file}"
>-        chmod 640 "${graylog_log_file}"
>-    fi
>-
>     install -d -o ${graylog_user} -g ${graylog_group} -m 750 "${graylog_data_dir}"
>     install -d -o ${graylog_user} -g ${graylog_group} -m 750 "${graylog_run_dir}"
> }
> 
>+start_precmd="graylog_precmd"
>+
> run_rc_command "$1"

Actions: View | Diff

Attachments on bug 218814: 182001 | 182061 | 182109