Now astakos also publishes resource events (for addcredits)

[aquarium] / src / main / resources / aquarium.properties

diff --git a/src/main/resources/aquarium.properties b/src/main/resources/aquarium.properties
index eab7427..afb7293 100644 (file)
--- a/src/main/resources/aquarium.properties
+++ b/src/main/resources/aquarium.properties
@@ -1,13 +1,4 @@
-version = 0.0.2-SNAPSHOT
-
-# Location of the Aquarium accounting policy config file. If commented
-# out, Aquarium will look for the file policy.yaml first at the program
-# starting directory and then fall back to the classpath.
-aquarium.policy = policy.yaml
-
-# Location of the file that defines the mappings between
-# user roles and agreements
-aquarium.role-agreement.map=role-agreement.map
+version = 0.2.0-SNAPSHOT
 
 ### Queue related settings
 
@@ -27,16 +18,22 @@ rabbitmq.username=guest
 # Passwd for connecting with the AMQP server
 rabbitmq.passwd=guest
 
+# Exchnage used by Aquarium to publish messages
+rabbitmq.exchange=aquarium
+
 # Virtual host on the AMQP server
 rabbitmq.vhost=/
 
 # Queue declarations for receiving resource events.
 # Format is "exchange:routing.key:queue". Entries are separated by comma ','
-rabbitmq.rcevents.queues=pithos:pithos.resource.#:aquarium-pithos-rcevents,cyclades:cyclades.resource.#:aquarium-cyclades-rcevents
+rabbitmq.rcevents.queues=astakos:astakos.resource.#:aquarium-astakos-rcevents,pithos:pithos.resource.#:aquarium-pithos-rcevents,cyclades:cyclades.resource.#:aquarium-cyclades-rcevents
 
 # Queue declarations for receiving IM events, format is "exchange:routing.key:queue"
 rabbitmq.imevents.queues=astakos:astakos.user:aquarium-imevents
 
+# For sending credit modifications
+rabbitmq.imevents.credit=astakos:astakos-events-credit
+
 # REST service listening port
 rest.port=8888
 
@@ -54,8 +51,8 @@ mongodb.username=aquarium
 # Password for connecting to the persistence service
 mongodb.password=aquarium
 
-# The name of the DB schema to use
-mongodb.dbschema=aquarium
+# The name of the MongoDB database to use
+mongodb.database=aquarium
 
 ### Performance options
 
@@ -80,33 +77,14 @@ anystore.reconnect.period.millis=1000
 # DO NOT TOUCH the following options, unless you know what you are doing
 #######
 
-# Actor subsystem
-actor.provider.class=gr.grnet.aquarium.service.SimpleLocalRoleableActorProviderService
 # Class that initializes the REST service
-rest.service.class=gr.grnet.aquarium.service.RESTActorService
+rest.service.class=gr.grnet.aquarium.service.FinagleRESTService
+rest.shutdown.timeout.millis=2000
 # Store subsystem
 store.provider.class=gr.grnet.aquarium.store.mongodb.MongoDBStoreProvider
-# Override the user store (if present, it will not be given by the store provider above)
-#user.state.store.class=gr.grnet.aquarium.store.memory.MemStorede the event store (if present, it will not be given by the store provider above)
-#resource.event.store.class=
-# Override the user event store (if present, it will not be given by the store provider above)
-#user.event.store.class=
-# Override the user event store (if present, it will not be given by the store provider above)
-#policy.store.class=
-
-# The lower mark for the UserActors' LRU.
-user.actor.LRU.lower.mark=800
-# The upper mark for the UserActors' LRU.
-user.actors.LRU.upper.mark=1000
-
-# A time period in milliseconds for which we can tolerate stale data regarding user state.
-user.state.timestamp.threshold=10000
-
-# Exchnage used by Aquarium to publish messages
-rabbitmq.exchange=aquarium
 
-# Save unparsed user events to user event store
-ack.unparsed.event.im=false
+# A time period in milliseconds for which we can tolerate stale parts regarding user state.
+user.state.timestamp.threshold=1
 
 # Administrative REST API authorization cookie
 admin.cookie=1
\ No newline at end of file