Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

amqp: adapt to new signal code and separate node-type configuration into in/out sections

Browse source
This commit is contained in:
Steffen Vogel 2018-08-20 18:30:01 +02:00
parent 1c59bb6d60
commit 7bdab0c204
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/nodes/amqp.c
View file

@ -133,7 +133,7 @@ int amqp_parse(struct node *n, json_t *json)
amqp_default_ssl_info(&a->ssl_info);
amqp_default_connection_info(&a->connection_info);
ret = json_unpack_ex(json, &err, 0, "{ s?: s, s?: s, s?: s, s?: s, s?: i, s: s, s: s, s?: s, s?: o }",
ret = json_unpack_ex(json, &err, 0, "{ s?: s, s?: s, s?: s, s?: s, s?: s, s?: i, s: s, s: s, s?: s, s?: o }",
"uri", &uri,
"host", &host,
"vhost", &vhost,
@ -199,7 +199,8 @@ char * amqp_print(struct node *n)
char *buf = NULL;
strcatf(&buf, "format=%s, uri=%s://%s:%s@%s:%d%s, exchange=%s, routing_key=%s", format_type_name(a->format),
strcatf(&buf, "format=%s, uri=%s://%s:%s@%s:%d%s, exchange=%s, routing_key=%s",
format_type_name(a->format),
a->connection_info.ssl ? "amqps" : "amqp",
a->connection_info.user,
a->connection_info.password,
@ -238,7 +239,11 @@ int amqp_start(struct node *n)
amqp_rpc_reply_t rep;
amqp_queue_declare_ok_t *r;
ret = io_init(&a->io, a->format, n, SAMPLE_HAS_ALL);
ret = io_init(&a->io, a->format, &n->signals, SAMPLE_HAS_ALL);
if (ret)
return ret;
ret = io_check(&a->io);
if (ret)
return ret;
@ -298,6 +303,10 @@ int amqp_stop(struct node *n)
if (ret)
return ret;
ret = io_destroy(&a->io);
if (ret)
return ret;
return 0;
}
@ -358,13 +367,8 @@ int amqp_fd(struct node *n)
int amqp_destroy(struct node *n)
{
int ret;
struct amqp *a = n->_vd;
ret = io_destroy(&a->io);
if (ret)
return ret;
if (a->uri)
free(a->uri);