Skip to content

Commit

Permalink
bug fix searchd listen multi value
Browse files Browse the repository at this point in the history
  • Loading branch information
Sergey Viskov committed Aug 17, 2016
1 parent 93334df commit 255d14a
Show file tree
Hide file tree
Showing 18 changed files with 24 additions and 20 deletions.
10 changes: 7 additions & 3 deletions docker/docker-compose.yml
@@ -1,8 +1,12 @@
sphinx:
build: image
dockerfile: Dockerfile
expose:
- "9311:9306"
ports:
- "9312:9312"
- "9306:9306"
volumes:
- "../sphinx/conf:/etc/sphinxsearch"
- "../runtime:/var/log"
- "../runtime:/var/log"
- "../runtime/data:/var/lib/sphinx/data"
command: "sleep infinity"
mem_limit: 150m
2 changes: 1 addition & 1 deletion sphinx/docs/documentation_2.1.1.yaml
Expand Up @@ -751,5 +751,5 @@ searchd:
description: "Interface IP address to bind on.\r\nOptional, default is 0.0.0.0 (ie. listen on all interfaces).\r\nDEPRECATED, use listen instead.\r\n\r\naddress setting lets you specify which network interface\r\nsearchd will bind to, listen on, and accept incoming\r\nnetwork connections on. The default value is 0.0.0.0 which means to listen\r\non all interfaces. At the time, you can not specify multiple interfaces.\r\nExample:\r\naddress = 192.168.0.1"
listen:
link: 'http://sphinxsearch.com/docs/archives/manual-2.1.1.html#conf-listen'
multi_value: false
multi_value: true
description: "This setting lets you specify IP address and port, or Unix-domain\r\nsocket path, that searchd will listen on.\r\nIntroduced in version 0.9.9-rc1.\r\n\r\nThe informal grammar for listen setting is:\r\n\r\nlisten = ( address \":\" port | port | path ) [ \":\" protocol ]\r\n\r\nI.e. you can specify either an IP address (or hostname) and port\r\nnumber, or just a port number, or Unix socket path. If you specify\r\nport number but not the address, searchd will listen on\r\nall network interfaces. Unix path is identified by a leading slash.\r\n\r\nStarting with version 0.9.9-rc2, you can also specify a protocol\r\nhandler (listener) to be used for connections on this socket.\r\nSupported protocol values are 'sphinx' (Sphinx 0.9.x API protocol)\r\nand 'mysql41' (MySQL protocol used since 4.1 upto at least 5.1).\r\nMore details on MySQL protocol support can be found in\r\nSection\_5.10, “MySQL protocol support and SphinxQL” section.\r\nExamples:\r\nlisten = localhost\r\nlisten = localhost:5000\r\nlisten = 192.168.0.1:5000\r\nlisten = /var/run/sphinx.s\r\nlisten = 9312\r\nlisten = localhost:9306:mysql41\r\n\r\nThere can be multiple listen directives, searchd will\r\nlisten for client connections on all specified ports and sockets. If\r\nno listen directives are found then the server will listen\r\non all available interfaces using the default SphinxAPI port 9312.\r\nStarting with 1.10-beta, it will also listen on default SphinxQL\r\nport 9306. Both port numbers are assigned by IANA (see\r\nhttp://www.iana.org/assignments/port-numbers\r\nfor details) and should therefore be available.\r\n\r\nUnix-domain sockets are not supported on Windows."
2 changes: 1 addition & 1 deletion sphinx/docs/documentation_2.1.2.yaml
Expand Up @@ -755,5 +755,5 @@ searchd:
description: "Interface IP address to bind on.\r\nOptional, default is 0.0.0.0 (ie. listen on all interfaces).\r\nDEPRECATED, use listen instead.\r\n\r\naddress setting lets you specify which network interface\r\nsearchd will bind to, listen on, and accept incoming\r\nnetwork connections on. The default value is 0.0.0.0 which means to listen\r\non all interfaces. At the time, you can not specify multiple interfaces.\r\nExample:\r\naddress = 192.168.0.1"
listen:
link: 'http://sphinxsearch.com/docs/archives/manual-2.1.2.html#conf-listen'
multi_value: false
multi_value: true
description: "This setting lets you specify IP address and port, or Unix-domain\r\nsocket path, that searchd will listen on.\r\nIntroduced in version 0.9.9-rc1.\r\n\r\nThe informal grammar for listen setting is:\r\n\r\nlisten = ( address \":\" port | port | path ) [ \":\" protocol ]\r\n\r\nI.e. you can specify either an IP address (or hostname) and port\r\nnumber, or just a port number, or Unix socket path. If you specify\r\nport number but not the address, searchd will listen on\r\nall network interfaces. Unix path is identified by a leading slash.\r\n\r\nStarting with version 0.9.9-rc2, you can also specify a protocol\r\nhandler (listener) to be used for connections on this socket.\r\nSupported protocol values are 'sphinx' (Sphinx 0.9.x API protocol)\r\nand 'mysql41' (MySQL protocol used since 4.1 upto at least 5.1).\r\nMore details on MySQL protocol support can be found in\r\nSection\_5.10, “MySQL protocol support and SphinxQL” section.\r\nExamples:\r\nlisten = localhost\r\nlisten = localhost:5000\r\nlisten = 192.168.0.1:5000\r\nlisten = /var/run/sphinx.s\r\nlisten = 9312\r\nlisten = localhost:9306:mysql41\r\n\r\nThere can be multiple listen directives, searchd will\r\nlisten for client connections on all specified ports and sockets. If\r\nno listen directives are found then the server will listen\r\non all available interfaces using the default SphinxAPI port 9312.\r\nStarting with 1.10-beta, it will also listen on default SphinxQL\r\nport 9306. Both port numbers are assigned by IANA (see\r\nhttp://www.iana.org/assignments/port-numbers\r\nfor details) and should therefore be available.\r\n\r\nUnix-domain sockets are not supported on Windows."
2 changes: 1 addition & 1 deletion sphinx/docs/documentation_2.1.3.yaml
Expand Up @@ -755,5 +755,5 @@ searchd:
description: "Interface IP address to bind on.\r\nOptional, default is 0.0.0.0 (ie. listen on all interfaces).\r\nDEPRECATED, use listen instead.\r\n\r\naddress setting lets you specify which network interface\r\nsearchd will bind to, listen on, and accept incoming\r\nnetwork connections on. The default value is 0.0.0.0 which means to listen\r\non all interfaces. At the time, you can not specify multiple interfaces.\r\nExample:\r\naddress = 192.168.0.1"
listen:
link: 'http://sphinxsearch.com/docs/archives/manual-2.1.3.html#conf-listen'
multi_value: false
multi_value: true
description: "This setting lets you specify IP address and port, or Unix-domain\r\nsocket path, that searchd will listen on.\r\nIntroduced in version 0.9.9-rc1.\r\n\r\nThe informal grammar for listen setting is:\r\n\r\nlisten = ( address \":\" port | port | path ) [ \":\" protocol ]\r\n\r\nI.e. you can specify either an IP address (or hostname) and port\r\nnumber, or just a port number, or Unix socket path. If you specify\r\nport number but not the address, searchd will listen on\r\nall network interfaces. Unix path is identified by a leading slash.\r\n\r\nStarting with version 0.9.9-rc2, you can also specify a protocol\r\nhandler (listener) to be used for connections on this socket.\r\nSupported protocol values are 'sphinx' (Sphinx 0.9.x API protocol)\r\nand 'mysql41' (MySQL protocol used since 4.1 upto at least 5.1).\r\nMore details on MySQL protocol support can be found in\r\nSection\_5.10, “MySQL protocol support and SphinxQL” section.\r\nExamples:\r\nlisten = localhost\r\nlisten = localhost:5000\r\nlisten = 192.168.0.1:5000\r\nlisten = /var/run/sphinx.s\r\nlisten = 9312\r\nlisten = localhost:9306:mysql41\r\n\r\nThere can be multiple listen directives, searchd will\r\nlisten for client connections on all specified ports and sockets. If\r\nno listen directives are found then the server will listen\r\non all available interfaces using the default SphinxAPI port 9312.\r\nStarting with 1.10-beta, it will also listen on default SphinxQL\r\nport 9306. Both port numbers are assigned by IANA (see\r\nhttp://www.iana.org/assignments/port-numbers\r\nfor details) and should therefore be available.\r\n\r\nUnix-domain sockets are not supported on Windows."
2 changes: 1 addition & 1 deletion sphinx/docs/documentation_2.1.4.yaml
Expand Up @@ -755,5 +755,5 @@ searchd:
description: "Interface IP address to bind on.\r\nOptional, default is 0.0.0.0 (ie. listen on all interfaces).\r\nDEPRECATED, use listen instead.\r\n\r\naddress setting lets you specify which network interface\r\nsearchd will bind to, listen on, and accept incoming\r\nnetwork connections on. The default value is 0.0.0.0 which means to listen\r\non all interfaces. At the time, you can not specify multiple interfaces.\r\nExample:\r\naddress = 192.168.0.1"
listen:
link: 'http://sphinxsearch.com/docs/archives/manual-2.1.4.html#conf-listen'
multi_value: false
multi_value: true
description: "This setting lets you specify IP address and port, or Unix-domain\r\nsocket path, that searchd will listen on.\r\nIntroduced in version 0.9.9-rc1.\r\n\r\nThe informal grammar for listen setting is:\r\n\r\nlisten = ( address \":\" port | port | path ) [ \":\" protocol ]\r\n\r\nI.e. you can specify either an IP address (or hostname) and port\r\nnumber, or just a port number, or Unix socket path. If you specify\r\nport number but not the address, searchd will listen on\r\nall network interfaces. Unix path is identified by a leading slash.\r\n\r\nStarting with version 0.9.9-rc2, you can also specify a protocol\r\nhandler (listener) to be used for connections on this socket.\r\nSupported protocol values are 'sphinx' (Sphinx 0.9.x API protocol)\r\nand 'mysql41' (MySQL protocol used since 4.1 upto at least 5.1).\r\nMore details on MySQL protocol support can be found in\r\nSection\_5.10, “MySQL protocol support and SphinxQL” section.\r\nExamples:\r\nlisten = localhost\r\nlisten = localhost:5000\r\nlisten = 192.168.0.1:5000\r\nlisten = /var/run/sphinx.s\r\nlisten = 9312\r\nlisten = localhost:9306:mysql41\r\n\r\nThere can be multiple listen directives, searchd will\r\nlisten for client connections on all specified ports and sockets. If\r\nno listen directives are found then the server will listen\r\non all available interfaces using the default SphinxAPI port 9312.\r\nStarting with 1.10-beta, it will also listen on default SphinxQL\r\nport 9306. Both port numbers are assigned by IANA (see\r\nhttp://www.iana.org/assignments/port-numbers\r\nfor details) and should therefore be available.\r\n\r\nUnix-domain sockets are not supported on Windows."
2 changes: 1 addition & 1 deletion sphinx/docs/documentation_2.1.5.yaml
Expand Up @@ -755,5 +755,5 @@ searchd:
description: "Interface IP address to bind on.\r\nOptional, default is 0.0.0.0 (ie. listen on all interfaces).\r\nDEPRECATED, use listen instead.\r\n\r\naddress setting lets you specify which network interface\r\nsearchd will bind to, listen on, and accept incoming\r\nnetwork connections on. The default value is 0.0.0.0 which means to listen\r\non all interfaces. At the time, you can not specify multiple interfaces.\r\nExample:\r\naddress = 192.168.0.1"
listen:
link: 'http://sphinxsearch.com/docs/archives/manual-2.1.5.html#conf-listen'
multi_value: false
multi_value: true
description: "This setting lets you specify IP address and port, or Unix-domain\r\nsocket path, that searchd will listen on.\r\nIntroduced in version 0.9.9-rc1.\r\n\r\nThe informal grammar for listen setting is:\r\n\r\nlisten = ( address \":\" port | port | path ) [ \":\" protocol ]\r\n\r\nI.e. you can specify either an IP address (or hostname) and port\r\nnumber, or just a port number, or Unix socket path. If you specify\r\nport number but not the address, searchd will listen on\r\nall network interfaces. Unix path is identified by a leading slash.\r\n\r\nStarting with version 0.9.9-rc2, you can also specify a protocol\r\nhandler (listener) to be used for connections on this socket.\r\nSupported protocol values are 'sphinx' (Sphinx 0.9.x API protocol)\r\nand 'mysql41' (MySQL protocol used since 4.1 upto at least 5.1).\r\nMore details on MySQL protocol support can be found in\r\nSection\_5.10, “MySQL protocol support and SphinxQL” section.\r\nExamples:\r\nlisten = localhost\r\nlisten = localhost:5000\r\nlisten = 192.168.0.1:5000\r\nlisten = /var/run/sphinx.s\r\nlisten = 9312\r\nlisten = localhost:9306:mysql41\r\n\r\nThere can be multiple listen directives, searchd will\r\nlisten for client connections on all specified ports and sockets. If\r\nno listen directives are found then the server will listen\r\non all available interfaces using the default SphinxAPI port 9312.\r\nStarting with 1.10-beta, it will also listen on default SphinxQL\r\nport 9306. Both port numbers are assigned by IANA (see\r\nhttp://www.iana.org/assignments/port-numbers\r\nfor details) and should therefore be available.\r\n\r\nUnix-domain sockets are not supported on Windows."
2 changes: 1 addition & 1 deletion sphinx/docs/documentation_2.1.6.yaml
Expand Up @@ -755,5 +755,5 @@ searchd:
description: "Interface IP address to bind on.\r\nOptional, default is 0.0.0.0 (ie. listen on all interfaces).\r\nDEPRECATED, use listen instead.\r\n\r\naddress setting lets you specify which network interface\r\nsearchd will bind to, listen on, and accept incoming\r\nnetwork connections on. The default value is 0.0.0.0 which means to listen\r\non all interfaces. At the time, you can not specify multiple interfaces.\r\nExample:\r\naddress = 192.168.0.1"
listen:
link: 'http://sphinxsearch.com/docs/archives/manual-2.1.6.html#conf-listen'
multi_value: false
multi_value: true
description: "This setting lets you specify IP address and port, or Unix-domain\r\nsocket path, that searchd will listen on.\r\nIntroduced in version 0.9.9-rc1.\r\n\r\nThe informal grammar for listen setting is:\r\n\r\nlisten = ( address \":\" port | port | path ) [ \":\" protocol ]\r\n\r\nI.e. you can specify either an IP address (or hostname) and port\r\nnumber, or just a port number, or Unix socket path. If you specify\r\nport number but not the address, searchd will listen on\r\nall network interfaces. Unix path is identified by a leading slash.\r\n\r\nStarting with version 0.9.9-rc2, you can also specify a protocol\r\nhandler (listener) to be used for connections on this socket.\r\nSupported protocol values are 'sphinx' (Sphinx 0.9.x API protocol)\r\nand 'mysql41' (MySQL protocol used since 4.1 upto at least 5.1).\r\nMore details on MySQL protocol support can be found in\r\nSection\_5.10, “MySQL protocol support and SphinxQL” section.\r\nExamples:\r\nlisten = localhost\r\nlisten = localhost:5000\r\nlisten = 192.168.0.1:5000\r\nlisten = /var/run/sphinx.s\r\nlisten = 9312\r\nlisten = localhost:9306:mysql41\r\n\r\nThere can be multiple listen directives, searchd will\r\nlisten for client connections on all specified ports and sockets. If\r\nno listen directives are found then the server will listen\r\non all available interfaces using the default SphinxAPI port 9312.\r\nStarting with 1.10-beta, it will also listen on default SphinxQL\r\nport 9306. Both port numbers are assigned by IANA (see\r\nhttp://www.iana.org/assignments/port-numbers\r\nfor details) and should therefore be available.\r\n\r\nUnix-domain sockets are not supported on Windows."
2 changes: 1 addition & 1 deletion sphinx/docs/documentation_2.1.7.yaml
Expand Up @@ -755,5 +755,5 @@ searchd:
description: "Interface IP address to bind on.\r\nOptional, default is 0.0.0.0 (ie. listen on all interfaces).\r\nDEPRECATED, use listen instead.\r\n\r\naddress setting lets you specify which network interface\r\nsearchd will bind to, listen on, and accept incoming\r\nnetwork connections on. The default value is 0.0.0.0 which means to listen\r\non all interfaces. At the time, you can not specify multiple interfaces.\r\nExample:\r\naddress = 192.168.0.1"
listen:
link: 'http://sphinxsearch.com/docs/archives/manual-2.1.7.html#conf-listen'
multi_value: false
multi_value: true
description: "This setting lets you specify IP address and port, or Unix-domain\r\nsocket path, that searchd will listen on.\r\nIntroduced in version 0.9.9-rc1.\r\n\r\nThe informal grammar for listen setting is:\r\n\r\nlisten = ( address \":\" port | port | path ) [ \":\" protocol ]\r\n\r\nI.e. you can specify either an IP address (or hostname) and port\r\nnumber, or just a port number, or Unix socket path. If you specify\r\nport number but not the address, searchd will listen on\r\nall network interfaces. Unix path is identified by a leading slash.\r\n\r\nStarting with version 0.9.9-rc2, you can also specify a protocol\r\nhandler (listener) to be used for connections on this socket.\r\nSupported protocol values are 'sphinx' (Sphinx 0.9.x API protocol)\r\nand 'mysql41' (MySQL protocol used since 4.1 upto at least 5.1).\r\nMore details on MySQL protocol support can be found in\r\nSection\_5.10, “MySQL protocol support and SphinxQL” section.\r\nExamples:\r\nlisten = localhost\r\nlisten = localhost:5000\r\nlisten = 192.168.0.1:5000\r\nlisten = /var/run/sphinx.s\r\nlisten = 9312\r\nlisten = localhost:9306:mysql41\r\n\r\nThere can be multiple listen directives, searchd will\r\nlisten for client connections on all specified ports and sockets. If\r\nno listen directives are found then the server will listen\r\non all available interfaces using the default SphinxAPI port 9312.\r\nStarting with 1.10-beta, it will also listen on default SphinxQL\r\nport 9306. Both port numbers are assigned by IANA (see\r\nhttp://www.iana.org/assignments/port-numbers\r\nfor details) and should therefore be available.\r\n\r\nUnix-domain sockets are not supported on Windows."
2 changes: 1 addition & 1 deletion sphinx/docs/documentation_2.1.8.yaml
Expand Up @@ -755,5 +755,5 @@ searchd:
description: "Interface IP address to bind on.\nOptional, default is 0.0.0.0 (ie. listen on all interfaces).\nDEPRECATED, use listen instead.\n\naddress setting lets you specify which network interface\nsearchd will bind to, listen on, and accept incoming\nnetwork connections on. The default value is 0.0.0.0 which means to listen\non all interfaces. At the time, you can not specify multiple interfaces.\nExample:\naddress = 192.168.0.1"
listen:
link: 'http://sphinxsearch.com/docs/archives/manual-2.1.8.html#conf-listen'
multi_value: false
multi_value: true
description: "This setting lets you specify IP address and port, or Unix-domain\nsocket path, that searchd will listen on.\nIntroduced in version 0.9.9-rc1.\n\nThe informal grammar for listen setting is:\n\nlisten = ( address \":\" port | port | path ) [ \":\" protocol ]\n\nI.e. you can specify either an IP address (or hostname) and port\nnumber, or just a port number, or Unix socket path. If you specify\nport number but not the address, searchd will listen on\nall network interfaces. Unix path is identified by a leading slash.\n\nStarting with version 0.9.9-rc2, you can also specify a protocol\nhandler (listener) to be used for connections on this socket.\nSupported protocol values are 'sphinx' (Sphinx 0.9.x API protocol)\nand 'mysql41' (MySQL protocol used since 4.1 upto at least 5.1).\nMore details on MySQL protocol support can be found in\nSection\_5.10, “MySQL protocol support and SphinxQL” section.\nExamples:\nlisten = localhost\nlisten = localhost:5000\nlisten = 192.168.0.1:5000\nlisten = /var/run/sphinx.s\nlisten = 9312\nlisten = localhost:9306:mysql41\n\nThere can be multiple listen directives, searchd will\nlisten for client connections on all specified ports and sockets. If\nno listen directives are found then the server will listen\non all available interfaces using the default SphinxAPI port 9312.\nStarting with 1.10-beta, it will also listen on default SphinxQL\nport 9306. Both port numbers are assigned by IANA (see\nhttp://www.iana.org/assignments/port-numbers\nfor details) and should therefore be available.\n\nUnix-domain sockets are not supported on Windows."

0 comments on commit 255d14a

Please sign in to comment.