Api: centralize formatting stream topic+qualifier
This commit is contained in:
1 parent
a0c572ef2e
commit
0bdd2dfca0
19 files changed
+41
-55
No files matched your search
@@ -181,11 +181,16 @@ void safe_call_subscription_callback(raw_subscription_callback cb, EventType typ
|
||||
}
|
||||
|
||||
|
||||
bts::qbus::Topic stream_topic(const std::string& base_topic, const char* method_and_qualifier) {
|
||||
return qbus::Topic(base_topic + "-" + method_and_qualifier);
|
||||
bts::qbus::Topic stream_topic(const std::string& base_topic, const char* method, const char* qualifier) {
|
||||
if (qualifier == nullptr || strlen(qualifier) == 0) {
|
||||
return qbus::Topic(base_topic + "-" + method);
|
||||
}
|
||||
else {
|
||||
return qbus::Topic(base_topic + "-" + method + "/" + qualifier);
|
||||
}
|
||||
}
|
||||
|
||||
CAPI TableSubscription api_client_subscribe(ApiClient* pclient, const char* method_and_qualifier, raw_subscription_callback cb, void* extra) {
|
||||
CAPI TableSubscription api_client_subscribe(ApiClient* pclient, const char* method, const char* qualifier, raw_subscription_callback cb, void* extra) {
|
||||
bts_assert(pclient);
|
||||
static_assert((int)qbus::TableEvent::EventType::TABLE_CREATED == EventType::TABLE_CREATED, "Keep these Enums in sync");
|
||||
static_assert((int)qbus::TableEvent::EventType::TABLE_DESTROYED == EventType::TABLE_DESTROYED, "");
|
||||
@@ -194,7 +199,7 @@ CAPI TableSubscription api_client_subscribe(ApiClient* pclient, const char* meth
|
||||
static_assert((int)qbus::Change::Type::REPLACE == StreamUpdate::REPLACE, "");
|
||||
static_assert((int)qbus::Change::Type::CREATE == StreamUpdate::CREATE, "");
|
||||
|
||||
auto topic = stream_topic(pclient->service_name, method_and_qualifier);
|
||||
auto topic = stream_topic(pclient->service_name, method, qualifier);
|
||||
LOG(Api,Diag,"api subscribe: {}" ,topic.value());
|
||||
|
||||
auto result = new qbus::TableSubscriber(pclient->qbus, equal_topic(topic), [cb, extra](const qbus::TableEvent& ev) {
|
||||
|
||||
Reference in new issue
Block a user