Репозитории ALT
S: | 1.24.0-alt3 |
5.1: | 1.0.4-alt0.M51.1 |
4.1: | 0.6.29-alt1.M41.2 |
4.0: | 0.5.38-alt0.M40.1 |
+backports: | 0.5.33-alt1.M40.1 |
3.0: | 0.1.45-alt1 |
Группа :: Система/Серверы
Пакет: nginx
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: nginx-0.8-syslog.patch
Скачать
Скачать
diff --git a/nginx/auto/make b/nginx/auto/make
index 27f71ec..351d242 100644
--- a/nginx/auto/make
+++ b/nginx/auto/make
@@ -15,6 +15,10 @@ mkdir -p $NGX_OBJS/src/core $NGX_OBJS/src/event $NGX_OBJS/src/event/modules \
ngx_objs_dir=$NGX_OBJS$ngx_regex_dirsep
ngx_use_pch=`echo $NGX_USE_PCH | sed -e "s/\//$ngx_regex_dirsep/g"`
+#SYSLOG
+if [[ "${USE_SYSLOG}" == "YES" ]]; then
+ CFLAGS="$CFLAGS -DUSE_SYSLOG"
+fi
cat << END > $NGX_MAKEFILE
diff --git a/nginx/auto/options b/nginx/auto/options
index f3c82d2..7d36694 100644
--- a/nginx/auto/options
+++ b/nginx/auto/options
@@ -113,6 +113,8 @@ MD5=NONE
MD5_OPT=
MD5_ASM=NO
+USE_SYSLOG=NO
+
USE_SHA1=NO
SHA1=NONE
SHA1_OPT=
@@ -260,6 +262,8 @@ do
--with-md5-opt=*) MD5_OPT="$value" ;;
--with-md5-asm) MD5_ASM=YES ;;
+ --with-syslog) USE_SYSLOG=YES ;;
+
--with-sha1=*) SHA1="$value" ;;
--with-sha1-opt=*) SHA1_OPT="$value" ;;
--with-sha1-asm) SHA1_ASM=YES ;;
@@ -395,6 +399,8 @@ cat << END
--with-md5-opt=OPTIONS set additional options for md5 building
--with-md5-asm use md5 assembler sources
+ --with-syslog use syslog instead of files to log messages
+
--with-sha1=DIR set path to sha1 library sources
--with-sha1-opt=OPTIONS set additional options for sha1 building
--with-sha1-asm use sha1 assembler sources
@@ -412,6 +418,7 @@ cat << END
--with-openssl-opt=OPTIONS set additional options for OpenSSL building
--with-debug enable the debugging logging
+
END
diff --git a/nginx/auto/summary b/nginx/auto/summary
index 50cbbf9..fa376ad 100644
--- a/nginx/auto/summary
+++ b/nginx/auto/summary
@@ -77,6 +77,11 @@ case $NGX_LIBATOMIC in
*) echo " + using libatomic_ops library: $NGX_LIBATOMIC" ;;
esac
+case $USE_SYSLOG in
+ YES) echo " + using syslog" ;;
+ *) echo " + syslog is not used" ;;
+esac
+
echo
diff --git a/nginx/src/core/nginx.c b/nginx/src/core/nginx.c
index 5df96a4..0fba8a1 100644
--- a/nginx/src/core/nginx.c
+++ b/nginx/src/core/nginx.c
@@ -8,6 +8,9 @@
#include <ngx_core.h>
#include <nginx.h>
+#ifdef USE_SYSLOG
+#include <syslog.h>
+#endif
static ngx_int_t ngx_add_inherited_sockets(ngx_cycle_t *cycle);
static ngx_int_t ngx_get_options(int argc, char *const *argv);
@@ -278,6 +281,11 @@ main(int argc, char *const *argv)
ngx_ssl_init(log);
#endif
+ /* SYSLOG SUPPORT */
+#ifdef USE_SYSLOG
+ openlog("nginx", LOG_ODELAY, LOG_LOCAL5);
+#endif
+
/*
* init_cycle->log is required for signal handlers and
* ngx_process_options()
@@ -396,6 +404,10 @@ main(int argc, char *const *argv)
ngx_master_process_cycle(cycle);
}
+#ifdef USE_SYSLOG
+ closelog();
+#endif
+
return 0;
}
diff --git a/nginx/src/core/ngx_conf_file.c b/nginx/src/core/ngx_conf_file.c
index 6d5f510..4abe3dd 100644
--- a/nginx/src/core/ngx_conf_file.c
+++ b/nginx/src/core/ngx_conf_file.c
@@ -907,6 +907,12 @@ ngx_conf_open_file(ngx_cycle_t *cycle, ngx_str_t *name)
full.data = NULL;
#endif
+#ifdef USE_SYSLOG
+ if (name->len) {
+ name->len = 0;
+ }
+#endif
+
if (name->len) {
full = *name;
diff --git a/nginx/src/core/ngx_log.c b/nginx/src/core/ngx_log.c
index 770a590..bf2fa79 100644
--- a/nginx/src/core/ngx_log.c
+++ b/nginx/src/core/ngx_log.c
@@ -7,6 +7,9 @@
#include <ngx_config.h>
#include <ngx_core.h>
+#ifdef USE_SYSLOG
+#include <syslog.h>
+#endif
static char *ngx_error_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
@@ -90,9 +93,11 @@ ngx_log_error_core(ngx_uint_t level, ngx_log_t *log, ngx_err_t err,
u_char *p, *last, *msg;
u_char errstr[NGX_MAX_ERROR_STR];
+#ifndef USE_SYSLOG
if (log->file->fd == NGX_INVALID_FILE) {
return;
}
+#endif
last = errstr + NGX_MAX_ERROR_STR;
@@ -139,7 +144,21 @@ ngx_log_error_core(ngx_uint_t level, ngx_log_t *log, ngx_err_t err,
ngx_linefeed(p);
+#ifdef USE_SYSLOG
+ /* allocate a string which can hold the error message */
+ char *syslogstr;
+
+ if ((syslogstr = calloc((p - errstr + 1), sizeof(char))) != NULL) {
+ strncpy(syslogstr, errstr, p - errstr);
+
+ /* write to syslog */
+ syslog(LOG_CRIT, "%s", syslogstr);
+
+ free(syslogstr);
+ }
+#else
(void) ngx_write_fd(log->file->fd, errstr, p - errstr);
+#endif
if (!ngx_use_stderr
|| level > NGX_LOG_WARN
@@ -428,6 +447,10 @@ ngx_error_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
value = cf->args->elts;
+#ifdef USE_SYSLOG
+ value[1].data = "stderr";
+#endif
+
if (ngx_strcmp(value[1].data, "stderr") == 0) {
ngx_str_null(&name);
diff --git a/nginx/src/http/modules/ngx_http_log_module.c b/nginx/src/http/modules/ngx_http_log_module.c
index 0752d03..cf9439a 100644
--- a/nginx/src/http/modules/ngx_http_log_module.c
+++ b/nginx/src/http/modules/ngx_http_log_module.c
@@ -8,6 +8,9 @@
#include <ngx_core.h>
#include <ngx_http.h>
+#ifdef USE_SYSLOG
+#include <syslog.h>
+#endif
typedef struct ngx_http_log_op_s ngx_http_log_op_t;
@@ -310,6 +313,19 @@ static void
ngx_http_log_write(ngx_http_request_t *r, ngx_http_log_t *log, u_char *buf,
size_t len)
{
+#ifdef USE_SYSLOG
+ /* allocate a string which can hold the error message */
+ char *syslogstr;
+
+ if ((syslogstr = calloc((len + 1), sizeof(char))) != NULL) {
+ strncpy(syslogstr, buf, len);
+
+ /* write to syslog */
+ syslog(LOG_NOTICE, "%s", syslogstr);
+
+ free(syslogstr);
+ }
+#else
u_char *name;
time_t now;
ssize_t n;
@@ -354,6 +370,7 @@ ngx_http_log_write(ngx_http_request_t *r, ngx_http_log_t *log, u_char *buf,
log->error_log_time = now;
}
+#endif
}
@@ -819,7 +836,11 @@ ngx_http_log_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
return NGX_CONF_ERROR;
}
+#ifdef USE_SYSLOG
+ ngx_http_access_log.data = "";
+#endif
log->file = ngx_conf_open_file(cf->cycle, &ngx_http_access_log);
+
if (log->file == NULL) {
return NGX_CONF_ERROR;
}
@@ -884,7 +905,11 @@ ngx_http_log_set_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
n = ngx_http_script_variables_count(&value[1]);
if (n == 0) {
+#ifdef USE_SYSLOG
+ value[1].data = "";
+#endif
log->file = ngx_conf_open_file(cf->cycle, &value[1]);
+
if (log->file == NULL) {
return NGX_CONF_ERROR;
}