Attachment #182001 for bug #218814

Lines 2-8 Link Here

(-)sysutils/graylog/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= graylog	4	PORTNAME= graylog
5	PORTVERSION= 2.2.2	5	PORTVERSION= 2.2.3
6	CATEGORIES= sysutils java	6	CATEGORIES= sysutils java
7	MASTER_SITES= https://packages.graylog2.org/releases/graylog/ \	7	MASTER_SITES= https://packages.graylog2.org/releases/graylog/ \
8	http://packages.graylog2.org/releases/graylog/	8	http://packages.graylog2.org/releases/graylog/

Lines 1-3 Link Here

(-)sysutils/graylog/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1488634660	1	TIMESTAMP = 1492723318
2	SHA256 (graylog-2.2.2.tgz) = 46f419d422f6e5816b29333c8510524f1bbc910d6bf00136adb3899a985fceb4	2	SHA256 (graylog-2.2.3.tgz) = 3de01e7cb8ebc02a7f06cec1c88eded3b717762447bf1b56bff8744f7f5ea80b
3	SIZE (graylog-2.2.2.tgz) = 99956086	3	SIZE (graylog-2.2.3.tgz) = 99971278




: ${graylog_dir:="%%DATADIR%%"}
: ${graylog_data_dir:="%%GRAYLOG_DATA_DIR%%"}
: ${graylog_run_dir:="/var/run/graylog"}
: ${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 \
    "

app_pidfile="${graylog_run_dir}/${name}.pid"
pidfile="${graylog_run_dir}/daemon.pid"
command="/usr/sbin/daemon"
               -XX:+ResizeTLAB \
               -XX:+UseConcMarkSweepGC \
               -XX:+CMSConcurrentMTEnabled \
               -XX:+CMSClassUnloadingEnabled \
               -XX:+UseParNewGC \
               -XX:-OmitStackTraceInFastThrow"

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}"

required_files="%%LOCALBASE%%/bin/java ${graylog_config}"
command=/usr/bin/nohup

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"

Return to bug 218814

Lines 61-104 Link Here

(-)sysutils/graylog/files/graylog.in (-30 / +40 lines)
61	: ${graylog_dir:="%%DATADIR%%"}	61	: ${graylog_dir:="%%DATADIR%%"}
62	: ${graylog_data_dir:="%%GRAYLOG_DATA_DIR%%"}	62	: ${graylog_data_dir:="%%GRAYLOG_DATA_DIR%%"}
63	: ${graylog_run_dir:="/var/run/graylog"}	63	: ${graylog_run_dir:="/var/run/graylog"}
64	: ${graylog_log_file:="/var/log/graylog-server.log"}	64	: ${graylog_log_file:="/var/log/graylog/server.log"}
65		65
		66	java_options=" \
		67	-Djava.awt.headless=true \
		68	-Djava.net.preferIPv4Stack=true \
		69	-Dapp=${name} \
		70	-Dlog4j.configurationFile=${graylog_log_file} \
		71	-Xms${graylog_min_mem} \
		72	-Xmx${graylog_max_mem} \
		73	-XX:-OmitStackTraceInFastThrow \
		74	-XX:+AggressiveOpts \
		75	-XX:+CMSClassUnloadingEnabled \
		76	-XX:+CMSConcurrentMTEnabled \
		77	-XX:+CMSParallelRemarkEnabled \
		78	-XX:+DisableExplicitGC \
		79	-XX:+HeapDumpOnOutOfMemoryError \
		80	-XX:+ResizeTLAB \
		81	-XX:+UseCMSInitiatingOccupancyOnly \
		82	-XX:+UseCompressedOops \
		83	-XX:+UseConcMarkSweepGC \
		84	-XX:+UseFastAccessorMethods \
		85	-XX:+UseParNewGC \
		86	-XX:CMSInitiatingOccupancyFraction=75 \
		87	-XX:NewRatio=1 \
		88	"
66		89
67	java_options=" -Xms${graylog_min_mem} \	90	app_pidfile="${graylog_run_dir}/${name}.pid"
68	-Xmx${graylog_max_mem} \	91	pidfile="${graylog_run_dir}/daemon.pid"
69	-XX:NewRatio=1 \	92	command="/usr/sbin/daemon"
70	-XX:+ResizeTLAB \
71	-XX:+UseConcMarkSweepGC \
72	-XX:+CMSConcurrentMTEnabled \
73	-XX:+CMSClassUnloadingEnabled \
74	-XX:+UseParNewGC \
75	-XX:-OmitStackTraceInFastThrow"
76		93
77	start_precmd="graylog_precmd"	94	command_args=" \
		95	-c \
		96	-t ${name} \
		97	-r \
		98	-p ${app_pidfile} \
		99	-P ${pidfile} \
		100	%%LOCALBASE%%/bin/java \
		101	${java_options} \
		102	-jar ${graylog_dir}/graylog.jar server \
		103	--configfile ${graylog_config}"
78		104
79	pidfile="${graylog_run_dir}/${name}.pid"	105	required_files="%%LOCALBASE%%/bin/java ${graylog_config}"
80	command=/usr/bin/nohup
81		106
82	command_args="%%LOCALBASE%%/bin/java -jar ${graylog_dir}/graylog.jar server \
83	--configfile \"${graylog_config}\" \
84	--pidfile \"${pidfile}\" \
85	>> \"${graylog_log_file}\" \
86	2>> \"${graylog_log_file}\" &"
87
88	graylog_precmd() {	107	graylog_precmd() {
89	if [ ! -f "${graylog_config}" ]; then
90	echo "Configuration file ${graylog_config} not found"
91	exit 1
92	fi
93
94	if [ ! -f "${graylog_log_file}" ]; then
95	touch "${graylog_log_file}"
96	chown "${graylog_user}:${graylog_group}" "${graylog_log_file}"
97	chmod 640 "${graylog_log_file}"
98	fi
99
100	install -d -o ${graylog_user} -g ${graylog_group} -m 750 "${graylog_data_dir}"	108	install -d -o ${graylog_user} -g ${graylog_group} -m 750 "${graylog_data_dir}"
101	install -d -o ${graylog_user} -g ${graylog_group} -m 750 "${graylog_run_dir}"	109	install -d -o ${graylog_user} -g ${graylog_group} -m 750 "${graylog_run_dir}"
102	}	110	}
103		111
		112	start_precmd="graylog_precmd"
		113
104	run_rc_command "$1"	114	run_rc_command "$1"