mirror of https://git.kore.io/kore.git
Adjust examples after recent changes.
- New kodev tool generates config with server.pem/key.pem. - Use proper formats for kore_log(). - Update to new websocket api.
This commit is contained in:
parent
7f11e37161
commit
3e84502235
|
@ -6,8 +6,8 @@ load ./cookies.so
|
|||
tls_dhparam dh2048.pem
|
||||
|
||||
domain 127.0.0.1 {
|
||||
certfile cert/server.crt
|
||||
certkey cert/server.key
|
||||
certfile cert/server.pem
|
||||
certkey cert/key.pem
|
||||
|
||||
static / serve_cookies
|
||||
static /secure serve_cookies
|
||||
|
|
|
@ -5,7 +5,7 @@ load ./cpp.so
|
|||
tls_dhparam dh2048.pem
|
||||
|
||||
domain 127.0.0.1 {
|
||||
certfile cert/server.crt
|
||||
certkey cert/server.key
|
||||
certfile cert/server.pem
|
||||
certkey cert/key.pem
|
||||
static / page
|
||||
}
|
||||
|
|
|
@ -21,8 +21,8 @@ authentication auth_example {
|
|||
}
|
||||
|
||||
domain 127.0.0.1 {
|
||||
certfile cert/server.crt
|
||||
certkey cert/server.key
|
||||
certfile cert/server.pem
|
||||
certkey cert/key.pem
|
||||
accesslog kore_access.log
|
||||
|
||||
static /css/style.css serve_style_css
|
||||
|
|
|
@ -6,7 +6,7 @@ load ./headers.so
|
|||
tls_dhparam dh2048.pem
|
||||
|
||||
domain 127.0.0.1 {
|
||||
certfile cert/server.crt
|
||||
certkey cert/server.key
|
||||
certfile cert/server.pem
|
||||
certkey cert/key.pem
|
||||
static / page
|
||||
}
|
||||
|
|
|
@ -11,8 +11,8 @@ tls_dhparam dh2048.pem
|
|||
validator v_id regex ^-?[0-9]*$
|
||||
|
||||
domain 127.0.0.1 {
|
||||
certfile cert/server.crt
|
||||
certkey cert/server.key
|
||||
certfile cert/server.pem
|
||||
certkey cert/key.pem
|
||||
static / page
|
||||
|
||||
params get / {
|
||||
|
|
|
@ -6,8 +6,8 @@ load ./json_yajl.so
|
|||
tls_dhparam dh2048.pem
|
||||
|
||||
domain 127.0.0.1 {
|
||||
certfile cert/server.crt
|
||||
certkey cert/server.key
|
||||
certfile cert/server.pem
|
||||
certkey cert/key.pem
|
||||
|
||||
static / page
|
||||
}
|
||||
|
|
|
@ -6,8 +6,8 @@ load ./jsonrpc.so
|
|||
tls_dhparam dh2048.pem
|
||||
|
||||
domain 127.0.0.1 {
|
||||
certfile cert/server.crt
|
||||
certkey cert/server.key
|
||||
certfile cert/server.pem
|
||||
certkey cert/key.pem
|
||||
|
||||
static / homepage
|
||||
static /v1 v1
|
||||
|
|
|
@ -13,8 +13,8 @@ validator v_port regex ^[0-9]*$
|
|||
http_keepalive_time 0
|
||||
|
||||
domain 127.0.0.1 {
|
||||
certfile cert/server.crt
|
||||
certkey cert/server.key
|
||||
certfile cert/server.pem
|
||||
certkey cert/key.pem
|
||||
|
||||
static /connect open_connection
|
||||
|
||||
|
|
|
@ -6,8 +6,8 @@ tls_dhparam dh2048.pem
|
|||
workers 4
|
||||
|
||||
domain 127.0.0.1 {
|
||||
certfile cert/server.crt
|
||||
certkey cert/server.key
|
||||
certfile cert/server.pem
|
||||
certkey cert/key.pem
|
||||
static / page
|
||||
static /shutdown page_shutdown
|
||||
}
|
||||
|
|
|
@ -17,6 +17,6 @@ tls_dhparam dh2048.pem
|
|||
# We must still define a domain to use TLS. This might go away
|
||||
# in the future for NOHTTP=1
|
||||
domain 127.0.0.1 {
|
||||
certfile cert/server.crt
|
||||
certkey cert/server.key
|
||||
certfile cert/server.pem
|
||||
certkey cert/key.pem
|
||||
}
|
||||
|
|
|
@ -78,7 +78,7 @@ connection_recv_data(struct netbuf *nb)
|
|||
{
|
||||
struct connection *c = (struct connection *)nb->owner;
|
||||
|
||||
kore_log(LOG_NOTICE, "%p: received %u bytes", c, nb->s_off);
|
||||
kore_log(LOG_NOTICE, "%p: received %zu bytes", (void *)c, nb->s_off);
|
||||
|
||||
/* We will just dump these back to the client. */
|
||||
net_send_queue(c, nb->buf, nb->s_off);
|
||||
|
|
|
@ -11,8 +11,8 @@ tls_dhparam dh2048.pem
|
|||
validator v_id regex ^[0-9]*$
|
||||
|
||||
domain 127.0.0.1 {
|
||||
certfile cert/server.crt
|
||||
certkey cert/server.key
|
||||
certfile cert/server.pem
|
||||
certkey cert/key.pem
|
||||
|
||||
static / page
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ load ./pgsql-sync.so init
|
|||
tls_dhparam dh2048.pem
|
||||
|
||||
domain 127.0.0.1 {
|
||||
certfile cert/server.crt
|
||||
certkey cert/server.key
|
||||
certfile cert/server.pem
|
||||
certkey cert/key.pem
|
||||
static / page
|
||||
}
|
||||
|
|
|
@ -8,7 +8,7 @@ tls_dhparam dh2048.pem
|
|||
http_keepalive_time 0
|
||||
|
||||
domain 127.0.0.1 {
|
||||
certfile cert/server.crt
|
||||
certkey cert/server.key
|
||||
certfile cert/server.pem
|
||||
certkey cert/key.pem
|
||||
static / page
|
||||
}
|
||||
|
|
|
@ -9,8 +9,8 @@ websocket_maxframe 65536
|
|||
websocket_timeout 10000
|
||||
|
||||
domain 127.0.0.1 {
|
||||
certfile cert/server.crt
|
||||
certkey cert/server.key
|
||||
certfile cert/server.pem
|
||||
certkey cert/key.pem
|
||||
|
||||
static / page
|
||||
static /connect page_ws_connect
|
||||
|
|
|
@ -46,13 +46,6 @@ void websocket_message(struct connection *,
|
|||
int pipe_reader(struct kore_task *);
|
||||
void pipe_data_available(struct kore_task *);
|
||||
|
||||
/* Websocket callbacks. */
|
||||
struct kore_wscbs wscbs = {
|
||||
websocket_connect,
|
||||
websocket_message,
|
||||
websocket_disconnect
|
||||
};
|
||||
|
||||
/* Our pipe reader. */
|
||||
struct kore_task pipe_task;
|
||||
|
||||
|
@ -65,7 +58,7 @@ init(int state)
|
|||
return (KORE_RESULT_ERROR);
|
||||
|
||||
/* Only do this on a dedicated worker. */
|
||||
if (worker->id != 0)
|
||||
if (worker->id != 1)
|
||||
return (KORE_RESULT_OK);
|
||||
|
||||
/* Create our task. */
|
||||
|
@ -115,7 +108,8 @@ page(struct http_request *req)
|
|||
int
|
||||
page_ws_connect(struct http_request *req)
|
||||
{
|
||||
kore_websocket_handshake(req, &wscbs);
|
||||
kore_websocket_handshake(req, "websocket_connect",
|
||||
"websocket_message", "websocket_disconnect");
|
||||
return (KORE_RESULT_OK);
|
||||
}
|
||||
|
||||
|
@ -134,6 +128,8 @@ pipe_reader(struct kore_task *t)
|
|||
|
||||
fd = -1;
|
||||
|
||||
kore_log(LOG_INFO, "pipe_reader starting");
|
||||
|
||||
/* Just run forever. */
|
||||
for (;;) {
|
||||
/* Attempt to open the pipe if needed. */
|
||||
|
@ -142,7 +138,7 @@ pipe_reader(struct kore_task *t)
|
|||
|
||||
if ((fd = open("/tmp/pipe", O_RDONLY)) == -1) {
|
||||
kore_log(LOG_NOTICE, "failed to open pipe");
|
||||
sleep(10);
|
||||
sleep(1);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
@ -196,7 +192,8 @@ pipe_data_available(struct kore_task *t)
|
|||
kore_log(LOG_WARNING, "truncated data from task");
|
||||
|
||||
/* Broadcast it to all connected websocket clients. */
|
||||
kore_log(LOG_NOTICE, "got %d bytes from task", len);
|
||||
kore_log(LOG_NOTICE, "got %zu bytes from task", len);
|
||||
|
||||
kore_websocket_broadcast(NULL, WEBSOCKET_OP_TEXT,
|
||||
buf, len, WEBSOCKET_BROADCAST_GLOBAL);
|
||||
}
|
||||
|
|
|
@ -7,8 +7,8 @@ python_import src/query.py
|
|||
tls_dhparam dh2048.pem
|
||||
|
||||
domain * {
|
||||
certfile cert/server.crt
|
||||
certkey cert/server.key
|
||||
certfile cert/server.pem
|
||||
certkey cert/key.pem
|
||||
|
||||
static / query
|
||||
static /hello hello
|
||||
|
|
|
@ -24,8 +24,8 @@ authentication auth {
|
|||
}
|
||||
|
||||
domain * {
|
||||
certfile cert/server.crt
|
||||
certkey cert/server.key
|
||||
certfile cert/server.pem
|
||||
certkey cert/key.pem
|
||||
|
||||
# Mix page handlers between native and python.
|
||||
static / page
|
||||
|
|
|
@ -7,8 +7,8 @@ tls_dhparam dh2048.pem
|
|||
http_keepalive_time 600
|
||||
|
||||
domain 127.0.0.1 {
|
||||
certfile cert/server.crt
|
||||
certkey cert/server.key
|
||||
certfile cert/server.pem
|
||||
certkey cert/key.pem
|
||||
|
||||
static / page
|
||||
static /subscribe subscribe
|
||||
|
|
|
@ -12,8 +12,8 @@ http_keepalive_time 0
|
|||
validator v_user regex ^[a-z]*$
|
||||
|
||||
domain 127.0.0.1 {
|
||||
certfile cert/server.crt
|
||||
certkey cert/server.key
|
||||
certfile cert/server.pem
|
||||
certkey cert/key.pem
|
||||
accesslog kore_access.log
|
||||
|
||||
static / page_handler
|
||||
|
|
|
@ -12,6 +12,6 @@ bind 127.0.0.1 8888 client_setup
|
|||
|
||||
# Setup domain for TLS usage.
|
||||
domain localhost {
|
||||
certfile cert/server.crt
|
||||
certkey cert/server.key
|
||||
certfile cert/server.pem
|
||||
certkey cert/key.pem
|
||||
}
|
||||
|
|
|
@ -9,8 +9,8 @@ http_body_max 1024000000
|
|||
http_body_disk_offload 4096
|
||||
|
||||
domain 127.0.0.1 {
|
||||
certfile cert/server.crt
|
||||
certkey cert/server.key
|
||||
certfile cert/server.pem
|
||||
certkey cert/key.pem
|
||||
|
||||
static / page
|
||||
}
|
||||
|
|
|
@ -8,8 +8,8 @@ tls_dhparam dh2048.pem
|
|||
http_keepalive_time 600
|
||||
|
||||
domain 127.0.0.1 {
|
||||
certfile cert/server.crt
|
||||
certkey cert/server.key
|
||||
certfile cert/server.pem
|
||||
certkey cert/key.pem
|
||||
accesslog access.log
|
||||
|
||||
static / serve_page
|
||||
|
|
|
@ -93,8 +93,8 @@ video_stream(struct http_request *req)
|
|||
return (KORE_RESULT_OK);
|
||||
}
|
||||
|
||||
kore_log(LOG_NOTICE, "%p: opened %s (%s) for streaming (%ld ref:%d)",
|
||||
req->owner, v->path, ctype, v->size, v->ref);
|
||||
kore_log(LOG_NOTICE, "%p: opened %s (%s) for streaming (%lld ref:%d)",
|
||||
(void *)req->owner, v->path, ctype, v->size, v->ref);
|
||||
|
||||
if (http_request_header(req, "range", &header)) {
|
||||
if ((bytes = strchr(header, '=')) == NULL) {
|
||||
|
@ -148,8 +148,8 @@ video_stream(struct http_request *req)
|
|||
return (KORE_RESULT_OK);
|
||||
}
|
||||
|
||||
kore_log(LOG_NOTICE, "%p: %s sending: %ld-%ld/%ld",
|
||||
req->owner, v->path, start, end - 1, v->size);
|
||||
kore_log(LOG_NOTICE, "%p: %s sending: %lld-%lld/%lld",
|
||||
(void *)req->owner, v->path, start, end - 1, v->size);
|
||||
http_response_header(req, "content-range", rb);
|
||||
} else {
|
||||
start = 0;
|
||||
|
@ -261,8 +261,8 @@ video_stream_finish(struct netbuf *nb)
|
|||
struct video *v = nb->extra;
|
||||
|
||||
v->ref--;
|
||||
kore_log(LOG_NOTICE, "%p: video stream %s done (%d/%d ref:%d)",
|
||||
nb->owner, v->path, nb->s_off, nb->b_len, v->ref);
|
||||
kore_log(LOG_NOTICE, "%p: video stream %s done (%zu/%zu ref:%d)",
|
||||
(void *)nb->owner, v->path, nb->s_off, nb->b_len, v->ref);
|
||||
|
||||
if (v->ref == 0)
|
||||
video_unmap(v);
|
||||
|
|
|
@ -13,8 +13,8 @@ websocket_maxframe 65536
|
|||
websocket_timeout 20
|
||||
|
||||
domain 127.0.0.1 {
|
||||
certfile cert/server.crt
|
||||
certkey cert/server.key
|
||||
certfile cert/server.pem
|
||||
certkey cert/key.pem
|
||||
|
||||
static / page
|
||||
static /connect page_ws_connect
|
||||
|
|
Loading…
Reference in New Issue