Skip to content

Commit a40003e

Browse files
committed
(ws) echo_client command renamed to autoroute. Command exit once the server close the connection. push_server commands exit once N messages have been sent.
1 parent 5534a7f commit a40003e

File tree

6 files changed

+126
-150
lines changed

6 files changed

+126
-150
lines changed

docker-compose.yml

+10-66
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,11 @@
1-
version: "3"
1+
version: "3.3"
22
services:
3-
# snake:
4-
# image: bsergean/ws:build
5-
# entrypoint: ws snake --port 8767 --host 0.0.0.0 --redis_hosts redis1
6-
# ports:
7-
# - "8767:8767"
8-
# networks:
9-
# - ws-net
10-
# depends_on:
11-
# - redis1
12-
13-
# proxy:
14-
# image: bsergean/ws:build
15-
# entrypoint: strace ws proxy_server --remote_host 'wss://cobra.addsrv.com' --host 0.0.0.0 --port 8765 -v
16-
# ports:
17-
# - "8765:8765"
18-
# networks:
19-
# - ws-net
20-
21-
#pyproxy:
22-
# image: bsergean/ws_proxy:build
23-
# entrypoint: /usr/bin/ws_proxy.py --remote_url 'wss://cobra.addsrv.com' --host 0.0.0.0 --port 8765
24-
# ports:
25-
# - "8765:8765"
26-
# networks:
27-
# - ws-net
28-
29-
# # ws:
30-
# # security_opt:
31-
# # - seccomp:unconfined
32-
# # cap_add:
33-
# # - SYS_PTRACE
34-
# # stdin_open: true
35-
# # tty: true
36-
# # image: bsergean/ws:build
37-
# # entrypoint: sh
38-
# # networks:
39-
# # - ws-net
40-
# # depends_on:
41-
# # - redis1
42-
# #
43-
# # redis1:
44-
# # image: redis:alpine
45-
# # networks:
46-
# # - ws-net
47-
# #
48-
# # statsd:
49-
# # image: jaconel/statsd
50-
# # ports:
51-
# # - "8125:8125"
52-
# # environment:
53-
# # - STATSD_DUMP_MSG=true
54-
# # - GRAPHITE_HOST=127.0.0.1
55-
# # networks:
56-
# # - ws-net
57-
58-
compile:
59-
image: alpine
60-
entrypoint: sh
61-
stdin_open: true
62-
tty: true
63-
volumes:
64-
- /Users/bsergeant/src/foss:/home/bsergean/src/foss
65-
66-
networks:
67-
ws-net:
3+
push:
4+
entrypoint: ws push_server --host 0.0.0.0
5+
image: ${DOCKER_REPO}/ws:build
6+
7+
autoroute:
8+
entrypoint: ws autoroute ws://push:8008
9+
image: ${DOCKER_REPO}/ws:build
10+
depends_on:
11+
- push

docs/CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
All changes to this project will be documented in this file.
44

5+
## [10.3.3] - 2020-09-02
6+
7+
(ws) echo_client command renamed to autoroute. Command exit once the server close the connection. push_server commands exit once N messages have been sent.
8+
59
## [10.3.2] - 2020-08-31
610

711
(ws + cobra bots) add a cobra_to_cobra ws subcommand to subscribe to a channel and republish received events to a different channel

ixwebsocket/IXBench.cpp

+7-3
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@ namespace ix
1212
{
1313
Bench::Bench(const std::string& description)
1414
: _description(description)
15-
, _start(std::chrono::high_resolution_clock::now())
16-
, _reported(false)
1715
{
18-
;
16+
reset();
1917
}
2018

2119
Bench::~Bench()
@@ -26,6 +24,12 @@ namespace ix
2624
}
2725
}
2826

27+
void Bench::reset()
28+
{
29+
_start = std::chrono::high_resolution_clock::now();
30+
_reported = false;
31+
}
32+
2933
void Bench::report()
3034
{
3135
auto now = std::chrono::high_resolution_clock::now();

ixwebsocket/IXBench.h

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ namespace ix
1717
Bench(const std::string& description);
1818
~Bench();
1919

20+
void reset();
2021
void report();
2122
uint64_t getDuration() const;
2223

ixwebsocket/IXWebSocketVersion.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66

77
#pragma once
88

9-
#define IX_WEBSOCKET_VERSION "10.3.2"
9+
#define IX_WEBSOCKET_VERSION "10.3.3"

0 commit comments

Comments
 (0)