fox for issue 84. now recognizing "stdout" as as stdout. Also added docs to binary zip generation script and modified redis.windows.conf to remove references to unsupported daemonize flag

This commit is contained in:
jonathan pickett
2014-04-15 16:21:39 -07:00
parent bcfdbf7bcc
commit 3cd77a5cb5
4 changed files with 16 additions and 12 deletions
Binary file not shown.
+5
View File
@@ -6,6 +6,7 @@ $IncludeBaseDirectory = $false
$CurDir = [System.IO.Directory]::GetCurrentDirectory()
$PubDir = [System.IO.Path]::Combine($CurDir, "x64\Release\pub" )
$SourceDir = [System.IO.Path]::Combine($CurDir, "x64\Release" )
$DocumentationDir = [System.IO.Path]::Combine($CurDir, "setups\documentation" )
$Destination = [System.IO.Path]::Combine($CurDir, "..\bin\Release\redis-2.8.4.zip" )
[System.IO.Directory]::CreateDirectory($PubDir) | Out-Null
@@ -18,6 +19,10 @@ ForEach( $file in [System.IO.Directory]::EnumerateFiles($SourceDir, "*.exe" ) )
[System.IO.File]::Copy($file, [System.IO.Path]::Combine( $PubDir, [System.IO.Path]::GetFileName($file) ) )
}
ForEach( $file in [System.IO.Directory]::EnumerateFiles($DocumentationDir, "*.*" ) ) {
[System.IO.File]::Copy($file, [System.IO.Path]::Combine( $PubDir, [System.IO.Path]::GetFileName($file) ) )
}
If ( [System.IO.File]::Exists($Destination) ) {
[System.IO.File]::Delete($Destination)
}
+1 -10
View File
@@ -12,14 +12,6 @@
#
# units are case insensitive so 1GB 1Gb 1gB are all the same.
# By default Redis does not run as a daemon. Use 'yes' if you need it.
# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
daemonize no
# When running daemonized, Redis writes a pid file in /var/run/redis.pid by
# default. You can specify a custom pid file location here.
pidfile /var/run/redis.pid
# Accept connections on the specified port, default is 6379.
# If port 0 is specified Redis will not listen on a TCP socket.
port 6379
@@ -64,8 +56,7 @@ tcp-keepalive 0
loglevel notice
# Specify the log file name. Also 'stdout' can be used to force
# Redis to log on the standard output. Note that if you use standard
# output for logging but daemonize, logs will be sent to /dev/null
# Redis to log on the standard output.
logfile stdout
# To enable logging to the Windows EventLog, just set 'syslog-enabled' to
+10 -2
View File
@@ -64,7 +64,15 @@ void redisLogRaw(int level, const char *msg) {
FILE *fp;
char buf[64];
int rawmode = (level & REDIS_LOG_RAW);
int log_to_stdout = (logFile == NULL) ? 1 : (logFile[0] == '\0');
int log_to_stdout;
log_to_stdout = 0;
if (logFile == NULL) {
log_to_stdout = 1;
} else {
if ((logFile[0] == '\0') || (_stricmp(logFile, "stdout") == 0)) {
log_to_stdout = 1;
}
}
level &= 0xff; /* clear flags */
if (level < verbosity) return;
@@ -96,7 +104,7 @@ void redisLogRaw(int level, const char *msg) {
}
fflush(fp);
if (logFile) fclose(fp);
if (log_to_stdout == 0) fclose(fp);
#ifdef _WIN32
if (server.syslog_enabled) WriteEventLog(server.syslog_ident, msg);