Merge pull request #16 from francisoliverlee/features/2018-12-19-添加支持阿里domain
support namesrv domain in producer and consumer
diff --git a/src/PythonWrapper.cpp b/src/PythonWrapper.cpp
index 75b5167..8c7c1e2 100644
--- a/src/PythonWrapper.cpp
+++ b/src/PythonWrapper.cpp
@@ -116,6 +116,9 @@
int PySetProducerNameServerAddress(void *producer, const char *namesrv) {
return SetProducerNameServerAddress((CProducer *) producer, namesrv);
}
+int PySetProducerNameServerDomain(void *producer, const char *domain) {
+ return SetProducerNameServerDomain((CProducer *) producer, domain);
+}
int PySetProducerInstanceName(void *producer, const char *instanceName) {
return SetProducerInstanceName((CProducer *)producer, instanceName);
}
@@ -163,6 +166,9 @@
int PySetPushConsumerNameServerAddress(void *consumer, const char *namesrv) {
return SetPushConsumerNameServerAddress((CPushConsumer *) consumer, namesrv);
}
+int PySetPushConsumerNameServerDomain(void *consumer, const char *domain){
+ return SetPushConsumerNameServerDomain((CPushConsumer *) consumer, domain);
+}
int PySubscribe(void *consumer, const char *topic, const char *expression) {
return Subscribe((CPushConsumer *) consumer, topic, expression);
}
@@ -204,6 +210,11 @@
const char *channel){
return SetPushConsumerSessionCredentials((CPushConsumer *)consumer, accessKey, secretKey, channel);
}
+
+//push consumer
+int PySetPullConsumerNameServerDomain(void *consumer, const char *domain){
+ return SetPullConsumerNameServerDomain((CPullConsumer *) consumer, domain);
+}
//version
const char *PyGetVersion() {
return VERSION;
@@ -264,6 +275,7 @@
def("StartProducer", PyStartProducer);
def("ShutdownProducer", PyShutdownProducer);
def("SetProducerNameServerAddress", PySetProducerNameServerAddress);
+ def("SetProducerNameServerDomain", PySetProducerNameServerDomain);
def("SetProducerInstanceName", PySetProducerInstanceName);
def("SetProducerSessionCredentials", PySetProducerSessionCredentials);
def("SendMessageSync", PySendMessageSync);
@@ -275,6 +287,7 @@
def("StartPushConsumer", PyStartPushConsumer);
def("ShutdownPushConsumer", PyShutdownPushConsumer);
def("SetPushConsumerNameServerAddress", PySetPushConsumerNameServerAddress);
+ def("SetPushConsumerNameServerDomain", PySetPushConsumerNameServerDomain);
def("SetPushConsumerThreadCount", PySetPushConsumerThreadCount);
def("SetPushConsumerMessageBatchMaxSize", PySetPushConsumerMessageBatchMaxSize);
def("SetPushConsumerInstanceName", PySetPushConsumerInstanceName);
@@ -282,6 +295,9 @@
def("Subscribe", PySubscribe);
def("RegisterMessageCallback", PyRegisterMessageCallback);
+ //pull consumer
+ def("SetPullConsumerNameServerDomain", PySetPullConsumerNameServerDomain);
+
//For Version
def("GetVersion", PyGetVersion);
}
diff --git a/src/PythonWrapper.h b/src/PythonWrapper.h
index 7da396c..324676b 100644
--- a/src/PythonWrapper.h
+++ b/src/PythonWrapper.h
@@ -21,6 +21,7 @@
#include "CSendResult.h"
#include "CProducer.h"
#include "CPushConsumer.h"
+#include "CPullConsumer.h"
#include <boost/python.hpp>
using namespace boost::python;
@@ -71,6 +72,7 @@
int PyStartProducer(void *producer);
int PyShutdownProducer(void *producer);
int PySetProducerNameServerAddress(void *producer, const char *namesrv);
+int PySetProducerNameServerDomain(void *producer, const char *domain);
int PySetProducerInstanceName(void *producer, const char *instanceName);
int PySetProducerSessionCredentials(void *producer, const char *accessKey, const char *secretKey, const char *channel);
PySendResult PySendMessageSync(void *producer, void *msg);
@@ -85,6 +87,7 @@
int PyStartPushConsumer(void *consumer);
int PyShutdownPushConsumer(void *consumer);
int PySetPushConsumerNameServerAddress(void *consumer, const char *namesrv);
+int PySetPushConsumerNameServerDomain(void *consumer, const char *domain);
int PySubscribe(void *consumer, const char *topic, const char *expression);
int PyRegisterMessageCallback(void *consumer, PyObject *pCallback);
int PythonMessageCallBackInner(CPushConsumer *consumer, CMessageExt *msg);
@@ -93,6 +96,10 @@
int PySetPushConsumerInstanceName(void *consumer, const char *instanceName);
int PySetPushConsumerSessionCredentials(void *consumer, const char *accessKey, const char *secretKey,
const char *channel);
+
+//push consumer
+int PySetPullConsumerNameServerDomain(void *consumer, const char *domain);
+
#ifdef __cplusplus
};
#endif
