diff --git a/beatrix/src/main/java/com/ning/billing/beatrix/glue/BeatrixModule.java b/beatrix/src/main/java/com/ning/billing/beatrix/glue/BeatrixModule.java
index 267ad7a..8f13369 100644
--- a/beatrix/src/main/java/com/ning/billing/beatrix/glue/BeatrixModule.java
+++ b/beatrix/src/main/java/com/ning/billing/beatrix/glue/BeatrixModule.java
@@ -17,7 +17,6 @@
package com.ning.billing.beatrix.glue;
import org.skife.config.ConfigSource;
-import org.skife.config.ConfigurationObjectFactory;
import com.ning.billing.beatrix.DefaultBeatrixService;
import com.ning.billing.beatrix.bus.api.BeatrixService;
@@ -28,7 +27,6 @@ import com.ning.billing.bus.api.PersistentBus;
import com.ning.billing.bus.api.PersistentBusConfig;
import com.ning.billing.util.glue.BusProvider;
-import com.google.common.collect.ImmutableMap;
import com.google.inject.AbstractModule;
import com.google.inject.Key;
import com.google.inject.name.Names;
@@ -57,8 +55,8 @@ public class BeatrixModule extends AbstractModule {
bind(BeatrixService.class).to(DefaultBeatrixService.class);
bind(DefaultBeatrixService.class).asEagerSingleton();
- final PersistentBusConfig extBusConfig = new ConfigurationObjectFactory(configSource).buildWithReplacements(PersistentBusConfig.class,
- ImmutableMap.<String, String>of("instanceName", "external"));
+ final PersistentBusConfig extBusConfig = new ExternalPersistentBusConfig(configSource);
+
bind(BusProvider.class).annotatedWith(Names.named(EXTERNAL_BUS)).toInstance(new BusProvider(extBusConfig));
bind(PersistentBus.class).annotatedWith(Names.named(EXTERNAL_BUS)).toProvider(Key.get(BusProvider.class, Names.named(EXTERNAL_BUS))).asEagerSingleton();
diff --git a/beatrix/src/main/java/com/ning/billing/beatrix/glue/ExternalPersistentBusConfig.java b/beatrix/src/main/java/com/ning/billing/beatrix/glue/ExternalPersistentBusConfig.java
new file mode 100644
index 0000000..3ccc80c
--- /dev/null
+++ b/beatrix/src/main/java/com/ning/billing/beatrix/glue/ExternalPersistentBusConfig.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2010-2013 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.beatrix.glue;
+
+import org.skife.config.ConfigSource;
+import org.skife.config.ConfigurationObjectFactory;
+import org.skife.config.TimeSpan;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.ning.billing.bus.api.PersistentBusConfig;
+
+import com.google.common.collect.ImmutableMap;
+
+// Hack to make sure the external and internal buses don't share the same tables names.
+// See discussion https://groups.google.com/forum/#!msg/killbilling-users/x3o1-EjR3V0/ZJ-PJYFM_M0J
+public class ExternalPersistentBusConfig extends PersistentBusConfig {
+
+ private static final Logger logger = LoggerFactory.getLogger(ExternalPersistentBusConfig.class);
+
+ private static final String TABLE_NAME_DEFAULT_VALUE = "bus_events";
+ private static final String TABLE_NAME_ALTERNATE_DEFAULT_VALUE = "bus_ext_events";
+
+ private static final String HISTORY_TABLE_NAME_DEFAULT_VALUE = "bus_events_history";
+ private static final String HISTORY_TABLE_NAME_ALTERNATE_DEFAULT_VALUE = "bus_ext_events_history";
+
+ private final PersistentBusConfig internalPersistentBusConfig;
+ private final PersistentBusConfig externalPersistentBusConfig;
+
+ public ExternalPersistentBusConfig(final ConfigSource configSource) {
+ // See com.ning.billing.util.glue.BusModule
+ internalPersistentBusConfig = new ConfigurationObjectFactory(configSource).buildWithReplacements(PersistentBusConfig.class,
+ ImmutableMap.<String, String>of("instanceName", "main"));
+ externalPersistentBusConfig = new ConfigurationObjectFactory(configSource).buildWithReplacements(PersistentBusConfig.class,
+ ImmutableMap.<String, String>of("instanceName", "external"));
+ }
+
+ @Override
+ public int getMaxEntriesClaimed() {
+ return externalPersistentBusConfig.getMaxEntriesClaimed();
+ }
+
+ @Override
+ public TimeSpan getClaimedTime() {
+ return externalPersistentBusConfig.getClaimedTime();
+ }
+
+ @Override
+ public long getSleepTimeMs() {
+ return externalPersistentBusConfig.getSleepTimeMs();
+ }
+
+ @Override
+ public boolean isProcessingOff() {
+ return externalPersistentBusConfig.isProcessingOff();
+ }
+
+ @Override
+ public int getNbThreads() {
+ return externalPersistentBusConfig.getNbThreads();
+ }
+
+ @Override
+ public boolean isUsingInflightQueue() {
+ return externalPersistentBusConfig.isUsingInflightQueue();
+ }
+
+ @Override
+ public int getQueueCapacity() {
+ return externalPersistentBusConfig.getQueueCapacity();
+ }
+
+ @Override
+ public int getPrefetchEntries() {
+ return externalPersistentBusConfig.getPrefetchEntries();
+ }
+
+ @Override
+ public String getTableName() {
+ if (internalPersistentBusConfig.getTableName().equals(externalPersistentBusConfig.getTableName())) {
+ if (TABLE_NAME_DEFAULT_VALUE.equals(externalPersistentBusConfig.getTableName())) {
+ logger.debug("Overriding default value for the external bus table name");
+ return TABLE_NAME_ALTERNATE_DEFAULT_VALUE;
+ } else {
+ // Overridden by the user?
+ throw new IllegalArgumentException("The external and internal buses cannot share the same table name " + externalPersistentBusConfig.getTableName());
+ }
+ } else {
+ return externalPersistentBusConfig.getTableName();
+ }
+ }
+
+ @Override
+ public String getHistoryTableName() {
+ if (internalPersistentBusConfig.getHistoryTableName().equals(externalPersistentBusConfig.getHistoryTableName())) {
+ if (HISTORY_TABLE_NAME_DEFAULT_VALUE.equals(externalPersistentBusConfig.getHistoryTableName())) {
+ logger.debug("Overriding default value for the external bus history table name");
+ return HISTORY_TABLE_NAME_ALTERNATE_DEFAULT_VALUE;
+ } else {
+ // Overridden by the user?
+ throw new IllegalArgumentException("The external and internal buses cannot share the same history table name " + externalPersistentBusConfig.getHistoryTableName());
+ }
+ } else {
+ return externalPersistentBusConfig.getHistoryTableName();
+ }
+ }
+}
