| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| |
|
|
| |
without SSL in baserock builds.
|
| |
|
|
|
|
|
| |
*** NOTE ***
This version of websockify will break existing code which sub-classes
`WebsocketProxy` -- see pull requests #110 and #111
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
Since we switched to using the `logging` module to log
in pull request #100, none of the messages on the 'INFO'
level were being shown from `tests/echo.py` and
`tests/load.py`, since the default log level is 'WARNING'.
Now, the log level is set to INFO in `tests/echo.py` and
`tests/load.py`, to match the log level in the main websockify
executable.
Fixes #109
|
| | |
|
| |\
| |
| | |
Refactor to use standard SocketServer RequestHandler design.
|
| | |\
| |/
|/| |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Move around functions and methods, so that connection-related and
server-related stuff are close together.
This patch just moves things around - it does not change anything at
all. This can be verified with:
git diff | grep ^- | cut -c 2- | sort > removed
git diff | grep ^+ | cut -c 2- | sort > added
diff -u removed added
|
| | |
| |
| |
| | |
upstream/master.
|
| | |\
| |/
|/|
| |
| | |
Conflicts:
websockify/websocket.py
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
astrand/websockify:
Prepare for fixing https://github.com/kanaka/websockify/issues/71:
Move around functions and methods, so that connection-related and
server-related stuff are close together.
This patch just moves things around - it does not change anything at
all. This can be verified with:
git diff websocket.py | grep ^- | cut -c 2- | sort > removed
git diff websocket.py | grep ^+ | cut -c 2- | sort > added
diff -u removed added
|
| | |\
| |/
|/| |
|
| |\ \
| | |
| | | |
Rename self.client and new_client - prepare for #72 / #111
|
| | | |
| | |
| | |
| | |
| | |
| | | |
name in the SocketServer/HTTPServer request handler hierarchy. Prepare
for merge pull request #72. This work has been picked out of
7b3dd8a6f5ef26dbfd6c34a91600ea1613aefaa2 .
|
| |/ /
| |
| |
| |
| | |
request #72. The standard Python SocketServer/BaseRequestHandler
requires this name.
|
| | |
| |
| |
| | |
in request handler class.
|
| | |\
| |/
|/|
| |
| | |
* commit '34a1b68d79a13c03aa63b5c4194796341c9383fe':
Clarify ssl module build for old python versions.
|
| | | |
|
| | |\
| |/
|/|
| |
| | |
* commit 'a04edfe80f54b44df5a3579f71710560c6b7b4fc':
Added temp dir for unit test data and cleanup
|
| |\ \
| | |
| | | |
Added temp dir for unit test data and cleanup
|
| |/ /
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Unit test data will now go to a temporary dir that will be deleted
once the test completes. The unit tests also setup a logger which
will persist so that it can be inspected once tests complete.
Also fixes a bug where instance var is missing from decode_hybi()
Co-authored-by: natsume.takashi@lab.ntt.co.jp
|
| | |\
| |/
|/|
| |
| | |
* commit 'a47be21f9fa69ddf8d888ff9e3c75cdfc9e31c00':
Added unit tests for websocket and websocketproxy
|
| |\ \
| | |
| | | |
Added unit tests for websocket and websocketproxy
|
| |/ /
| |
| |
| |
| |
| |
| |
| |
| |
| | |
To run the unit tests just run tox from the top
level directory which will try to run unit tests
for most versions of python. Requires tox to be
installed. To run tox for a specifice env, run
tox -e<env> e.g. for python 2.7 run 'tox -epy27'.
Co-authored-by: natsume.takashi@lab.ntt.co.jp
|
| | |\
| |/
|/|
| |
| | |
* commit 'c3acdc2e38f871e28ffda1847b4338c4b02296b8':
Adds optional TCP_KEEPALIVE to WebSocketServer
|
| |\ \
| | |
| | | |
Adds optional TCP_KEEPALIVE to WebSocketServer
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
TCP_KEEPALIVE is now enabled by default. Settings for
KEEPCNT, KEEPINTVL and KEEPIDLE can be supplied when
creating WebSocketServer and KEEPALIVE can also be
disabled if required.
Also adds new unit test for testing.
Co-authored-by: natsume.takashi@lab.ntt.co.jp
|
| | | |\
| |_|/
|/| |
| | |
| | | |
* commit '13c99bcf053f7f3af8ba84c0d963a9591e020f49':
Fix search path construction in tests.
|
| | | |
| | |
| | |
| | |
| | |
| | | |
This way the tests can be run directly from within the tests directory
and they might also have a chance of running on Windows (where the
path separator is different).
|
| | | |\
| |_|/
|/| |
| | |
| | | |
* commit 'b4e0b534d5d04d57265045b4baf49dd81555064b':
Fix crash when an import is missing
|
| |\ \ \
| | | |
| | | | |
Fix crash when module is missing
|
| |/ / /
| | |
| | |
| | |
| | | |
self.msg is not available when checking the imports.
I had the problem on a host where numpy is missing (python 2.7.3).
|
| | | |\
| |_|/
|/| |
| | |
| | | |
* commit '32b0567343aee7753b2b6be1bc1ee9a69657ba26':
Fix syntax errors in other/websockify.rb
|
| |\ \ \
| | | |
| | | | |
Fix syntax errors in other/websockify.rb
|
| |/ / / |
|
| | | |\
| |_|/
|/| |
| | |
| | | |
* commit '0e5c3ecfda3b1506b41412052db75d84df2b4ae7':
Handle SIGCHLD properly for multiprocessing
|
| |\ \ \
| |/ /
|/| | |
Handle SIGCHLD properly for multiprocessing (fixes #101)
|
| |/ /
| |
| |
| |
| |
| |
| |
| |
| | |
This commit should fix #101 by enabling a special SIGCHLD
handler for when multiprocessing is in use. The handler
simply calls `multiprocessing.active_children()` (which in
turn calls `_cleanup()`) upon receiving a SIGCHLD. Now,
the `fallback_SIGCHLD` is only called when `multiprocessing`
is not in use. See also #95.
|
| | |\
| |/
|/|
| |
| |
| | |
* commit 'a61ae52610642ae58e914dda705df8bb9c8213ec':
fixed 1.8 compatibility bug for OpenSSL::SSL::SSLSocket#read_nonblock vs #readpartial tested in 1.8 and 2.0
adding SSL support and Ruby1.9 support
|
| |\ \
| | |
| | | |
OpenSSL Support for Ruby Module of Websockify
|
| | | |
| | |
| | |
| | |
| | |
| | | |
#readpartial
tested in 1.8 and 2.0
|
| | | | |
|
| | | |\
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | | |
* commit '477dce6cf86d61b20a394f3cbf3170e60d199658':
websocket: use python logging module
websocket: fix exception statement introduced by comment 903e3f06ee557
Adapted to new standard SocketServer RequestHandler design. For
example, this means that self.i_am_client is not needed.
|
| |\ \ \
| | | |
| | | | |
websocket: use python logging module
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
WebSocketServer is a library module, as such, it cannot assume it can
write output to process stdout.
Python logging module is designed in order to allow subscribers to
handle the output out of modules. It is simple and generic mechanism to
separate between data producer and data handling.
Python logging API also has the nature of log level, so the verbose
parameter can probably be obsoleted in favor of logging level. And of
course the logging API has built in support for exception tracebacks, no
need for manual format.
Per upstream request a wrapper is created around python logging to
enable shorter statements and optional replacement.
Add --traffic parameter for traffic specific debug, this is required as
it uses direct unformatted stdout output.
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
|
| |/ / /
| | |
| | |
| | | |
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
|
| | | |\
| |_|/
|/| |
| | |
| | |
| | |
| | | |
* commit '4459824cc8196ad78fe9258b6c560ad46fe4cd52':
websocket: do not exit at the middle of process
websocket: restore signals after processing
websocket: support SIGTERM as exit signal
|
| |\ \ \
| | | |
| | | | |
Minor API cleanups
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
WebSocketServer is a library module, as such it should not exit process
but return from a method, allowing the caller to execute process show
down.
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
|
