Updated roles to work as a whole network

Updated logging to highest level and to a file
garethahealy · Jul 31, 2016 · f05b657 · f05b657
1 parent 10907e4
commit f05b657
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 32 deletions.
diff --git a/interconnect-vagrant/eu/qdrouterd.conf b/interconnect-vagrant/eu/qdrouterd.conf
@@ -1,12 +1,13 @@
 router {
-  mode: standalone
+  mode: interior
   id: Router.EU
 }
 
 listener {
   host: 0.0.0.0
   port: amqp
   authenticatePeer: no
+  role: inter-router
 }
 
 ## EU Broker Link
@@ -33,7 +34,7 @@ linkRoute {
 ## Iceland Router
 connector {
   name: ICE
-  role: normal
+  role: inter-router
   host: 10.22.3.11
   port: 5672
   saslMechanisms: ANONYMOUS
@@ -54,7 +55,7 @@ linkRoute {
 ## Japan Router
 connector {
   name: JAP
-  role: normal
+  role: inter-router
   host: 10.22.4.11
   port: 5672
   saslMechanisms: ANONYMOUS
@@ -73,11 +74,9 @@ linkRoute {
 }
 
 log {
-  module: ROUTER
-  enable: trace+
-}
-
-log {
-  module: ROUTER_MA
+  module: DEFAULT
   enable: trace+
+  timestamp: true
+  source: true
+  output: /tmp/qpid.log
 }
diff --git a/interconnect-vagrant/iceland/qdrouterd.conf b/interconnect-vagrant/iceland/qdrouterd.conf
@@ -5,9 +5,9 @@ router {
 
 listener {
   host: 0.0.0.0
-  role: inter-router
   port: amqp
   authenticatePeer: no
+  role: inter-router
 }
 
 ## EU Router
@@ -53,11 +53,9 @@ linkRoute {
 }
 
 log {
-  module: ROUTER
-  enable: trace+
-}
-
-log {
-  module: ROUTER_MA
+  module: DEFAULT
   enable: trace+
+  timestamp: true
+  source: true
+  output: /tmp/qpid.log
 }
diff --git a/interconnect-vagrant/japan/qdrouterd.conf b/interconnect-vagrant/japan/qdrouterd.conf
@@ -5,9 +5,9 @@ router {
 
 listener {
   host: 0.0.0.0
-  role: inter-router
   port: amqp
   authenticatePeer: no
+  role: inter-router
 }
 
 ## EU Router
@@ -53,11 +53,9 @@ linkRoute {
 }
 
 log {
-  module: ROUTER
-  enable: trace+
-}
-
-log {
-  module: ROUTER_MA
+  module: DEFAULT
   enable: trace+
+  timestamp: true
+  source: true
+  output: /tmp/qpid.log
 }
diff --git a/interconnect-vagrant/usa/qdrouterd.conf b/interconnect-vagrant/usa/qdrouterd.conf
@@ -1,12 +1,13 @@
 router {
-  mode: standalone
+  mode: interior
   id: Router.USA
 }
 
 listener {
   host: 0.0.0.0
   port: amqp
   authenticatePeer: no
+  role: inter-router
 }
 
 # USA Broker Link
@@ -33,7 +34,7 @@ linkRoute {
 ## Iceland Router
 connector {
   name: ICE
-  role: normal
+  role: inter-router
   host: 10.22.3.11
   port: 5672
   saslMechanisms: ANONYMOUS
@@ -54,7 +55,7 @@ linkRoute {
 ## Japan Router
 connector {
   name: JAP
-  role: normal
+  role: inter-router
   host: 10.22.4.11
   port: 5672
   saslMechanisms: ANONYMOUS
@@ -73,11 +74,9 @@ linkRoute {
 }
 
 log {
-  module: ROUTER
-  enable: trace+
-}
-
-log {
-  module: ROUTER_MA
+  module: DEFAULT
   enable: trace+
+  timestamp: true
+  source: true
+  output: /tmp/qpid.log
 }