Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
5d10923f
Commit
5d10923f
authored
Oct 13, 2010
by
Pieter Noordhuis
Browse files
Rename variable sockpath to unixsocket
parent
704bd093
Changes
4
Hide whitespace changes
Inline
Side-by-side
redis.conf
View file @
5d10923f
...
...
@@ -29,10 +29,11 @@ port 6379
#
# bind 127.0.0.1
# Specify the path for the domain socket that will be used to listen for
# incoming connections. If not specified, Redis will not use a domain socket.
# Specify the path for the unix socket that will be used to listen for
# incoming connections. There is no default, so Redis will not listen
# on a unix socket when not specified.
#
# socket /tmp/redis.sock
#
unix
socket /tmp/redis.sock
# Close the connection after a client is idle for N seconds (0 to disable)
timeout
300
...
...
src/config.c
View file @
5d10923f
...
...
@@ -73,8 +73,8 @@ void loadServerConfig(char *filename) {
}
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"bind"
)
&&
argc
==
2
)
{
server
.
bindaddr
=
zstrdup
(
argv
[
1
]);
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"socket"
)
&&
argc
==
2
)
{
server
.
sockpath
=
zstrdup
(
argv
[
1
]);
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"
unix
socket"
)
&&
argc
==
2
)
{
server
.
unixsocket
=
zstrdup
(
argv
[
1
]);
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"save"
)
&&
argc
==
3
)
{
int
seconds
=
atoi
(
argv
[
1
]);
int
changes
=
atoi
(
argv
[
2
]);
...
...
src/redis.c
View file @
5d10923f
...
...
@@ -698,7 +698,7 @@ void createSharedObjects(void) {
void
initServerConfig
()
{
server
.
port
=
REDIS_SERVERPORT
;
server
.
bindaddr
=
NULL
;
server
.
sockpath
=
NULL
;
server
.
unixsocket
=
NULL
;
server
.
ipfd
=
-
1
;
server
.
sofd
=
-
1
;
server
.
dbnum
=
REDIS_DEFAULT_DBNUM
;
...
...
@@ -783,9 +783,9 @@ void initServer() {
exit
(
1
);
}
}
if
(
server
.
sockpath
!=
NULL
)
{
unlink
(
server
.
sockpath
);
/* don't care if this fails */
server
.
sofd
=
anetUnixServer
(
server
.
neterr
,
server
.
sockpath
);
if
(
server
.
unixsocket
!=
NULL
)
{
unlink
(
server
.
unixsocket
);
/* don't care if this fails */
server
.
sofd
=
anetUnixServer
(
server
.
neterr
,
server
.
unixsocket
);
if
(
server
.
sofd
==
ANET_ERR
)
{
redisLog
(
REDIS_WARNING
,
"Opening socket: %s"
,
server
.
neterr
);
exit
(
1
);
...
...
@@ -1438,7 +1438,7 @@ int main(int argc, char **argv) {
if
(
server
.
ipfd
>
0
)
redisLog
(
REDIS_NOTICE
,
"The server is now ready to accept connections on port %d"
,
server
.
port
);
if
(
server
.
sofd
>
0
)
redisLog
(
REDIS_NOTICE
,
"The server is now ready to accept connections at %s"
,
server
.
sockpath
);
redisLog
(
REDIS_NOTICE
,
"The server is now ready to accept connections at %s"
,
server
.
unixsocket
);
aeSetBeforeSleepProc
(
server
.
el
,
beforeSleep
);
aeMain
(
server
.
el
);
aeDeleteEventLoop
(
server
.
el
);
...
...
src/redis.h
View file @
5d10923f
...
...
@@ -330,7 +330,7 @@ struct redisServer {
pthread_t
mainthread
;
int
port
;
char
*
bindaddr
;
char
*
sockpath
;
char
*
unixsocket
;
int
ipfd
;
int
sofd
;
redisDb
*
db
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment