community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed issues in mqtt input adapter and thrift adapter after testing with multitenancy

Browse Source
This commit is contained in:
ayyoob 2017-05-30 00:04:49 +05:30
parent 1b4de09d7b
commit aaeac03cfb
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/input/adapter/mqtt/util/MQTTAdapterListener.java
View File

@ -206,8 +206,14 @@ public class MQTTAdapterListener implements MqttCallback, Runnable {
} }
try { try {
mqttClient.subscribe(topic); mqttClient.subscribe(topic);
log.info("mqtt receiver subscribed to topic: " + topic);
} catch (MqttException e) { } catch (MqttException e) {
log.error("Failed to subscribe to topic: " + topic + ", Retrying....."); log.error("Failed to subscribe to topic: " + topic + ", Retrying.....");
try {
mqttClient.disconnect();
} catch (MqttException ex) {
// do nothing.
}
return false; return false;
} }
return true; return true;

2
components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.thrift/src/main/java/org/wso2/carbon/device/mgt/input/adapter/thrift/internal/ThriftEventAdapterServiceComponent.java
View File

@ -137,7 +137,7 @@ public class ThriftEventAdapterServiceComponent {
String tenantDomain = credentials.getDomainName(); String tenantDomain = credentials.getDomainName();
if (objects != null && objects.length > 0) { if (objects != null && objects.length > 0) {
if (tenantDomain.equals(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME)) { if (tenantDomain.equals(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME)) {
String[] splitValues = ((String) objects[0]).split("@@"); String[] splitValues = ((String) objects[0]).split("@");
if (splitValues.length > 1) { if (splitValues.length > 1) {
tenantDomain = splitValues[0]; tenantDomain = splitValues[0];
} }

8
components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/mqtt/authorization/DeviceAccessBasedMQTTAuthorizer.java
View File

@ -72,7 +72,7 @@ public class DeviceAccessBasedMQTTAuthorizer implements IAuthorizer {
private static final String UI_EXECUTE = "ui.execute"; private static final String UI_EXECUTE = "ui.execute";
private static Log log = LogFactory.getLog(DeviceAccessBasedMQTTAuthorizer.class); private static Log log = LogFactory.getLog(DeviceAccessBasedMQTTAuthorizer.class);
AuthorizationConfigurationManager MQTTAuthorizationConfiguration; private AuthorizationConfigurationManager MQTTAuthorizationConfiguration;
private static final String CDMF_SERVER_BASE_CONTEXT = "/api/device-mgt/v1.0"; private static final String CDMF_SERVER_BASE_CONTEXT = "/api/device-mgt/v1.0";
private static final String CACHE_MANAGER_NAME = "mqttAuthorizationCacheManager"; private static final String CACHE_MANAGER_NAME = "mqttAuthorizationCacheManager";
private static final String CACHE_NAME = "mqttAuthorizationCache"; private static final String CACHE_NAME = "mqttAuthorizationCache";
@ -173,17 +173,15 @@ public class DeviceAccessBasedMQTTAuthorizer implements IAuthorizer {
} catch (FeignException e) { } catch (FeignException e) {
oAuthRequestInterceptor.resetApiApplicationKey(); oAuthRequestInterceptor.resetApiApplicationKey();
if (e.getMessage().contains(GATEWAY_ERROR_CODE)) { if (e.getMessage().contains(GATEWAY_ERROR_CODE)) {
log.error("Failed to connect to the device authorization service."); log.error("Failed to connect to the device authorization service.", e);
} else { } else {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
} }
log.error(e.getMessage(), e);
} }
return false;
} finally { } finally {
PrivilegedCarbonContext.endTenantFlow(); PrivilegedCarbonContext.endTenantFlow();
} }
return false;
} }
/** /**