You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/10/30 18:06:15 UTC
[1/2] git commit: added additional logging for tests
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o e79fec001 -> aba512115
added additional logging for tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/b787a49b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b787a49b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b787a49b
Branch: refs/heads/two-dot-o
Commit: b787a49bebbfb78ef3df992b522217c9253ff16f
Parents: 8df2185
Author: Todd Nine <to...@apache.org>
Authored: Thu Oct 30 17:05:32 2014 +0000
Committer: Todd Nine <to...@apache.org>
Committed: Thu Oct 30 17:05:32 2014 +0000
----------------------------------------------------------------------
.../src/test/resources/logback-test.xml | 22 ++++++++++++++++++++
1 file changed, 22 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b787a49b/stack/loadtests/src/test/resources/logback-test.xml
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/test/resources/logback-test.xml b/stack/loadtests/src/test/resources/logback-test.xml
new file mode 100644
index 0000000..d15f9f4
--- /dev/null
+++ b/stack/loadtests/src/test/resources/logback-test.xml
@@ -0,0 +1,22 @@
+<configuration>
+
+ <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} [%-5level] %logger{15} - %msg%n%rEx</pattern>
+ <immediateFlush>false</immediateFlush>
+ </encoder>
+ </appender>
+
+ <!-- Uncomment for logging ALL HTTP request and responses -->
+ <!-- <logger name="io.gatling.http.ahc.AsyncHandlerActor" level="TRACE" /> -->
+ <!-- Uncomment for logging ONLY FAILED HTTP request and responses -->
+ <logger name="io.gatling.http.ahc.AsyncHandlerActor" level="DEBUG" />
+
+<logger name="io.gatling.http" level="TRACE" />
+ <!-- Uncomment for logging ONLY FAILED HTTP request and responses -->
+
+ <root level="WARN">
+ <appender-ref ref="CONSOLE" />
+ </root>
+
+</configuration>
[2/2] git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Posted by to...@apache.org.
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/aba51211
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/aba51211
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/aba51211
Branch: refs/heads/two-dot-o
Commit: aba512115139e94df7c78a19a70f5f2a8647b5ca
Parents: b787a49 e79fec0
Author: Todd Nine <to...@apache.org>
Authored: Thu Oct 30 17:07:06 2014 +0000
Committer: Todd Nine <to...@apache.org>
Committed: Thu Oct 30 17:07:06 2014 +0000
----------------------------------------------------------------------
portal/js/push/push-config.html | 89 +--
.../main/resources/usergrid-default.properties | 3 +
.../corepersistence/CpEntityDeleteListener.java | 45 +-
.../corepersistence/CpEntityManager.java | 73 ++-
.../corepersistence/CpEntityManagerFactory.java | 53 +-
.../corepersistence/CpManagerCache.java | 117 ++--
.../corepersistence/CpRelationManager.java | 31 +-
.../usergrid/corepersistence/CpSetup.java | 1 -
.../usergrid/corepersistence/CpWalker.java | 44 +-
.../results/FilteringLoader.java | 63 +-
.../results/ResultsLoaderFactory.java | 5 +-
.../results/ResultsLoaderFactoryImpl.java | 4 -
.../results/ResultsVerifier.java | 6 +-
.../results/VersionVerifier.java | 8 +-
.../corepersistence/util/CpEntityMapUtils.java | 5 +-
.../usergrid/persistence/entities/Notifier.java | 2 -
.../usergrid/persistence/index/EntityIndex.java | 4 +-
.../persistence/index/EntityIndexBatch.java | 6 -
.../persistence/index/EntityIndexFactory.java | 2 -
.../usergrid/persistence/index/IndexScope.java | 9 +-
.../persistence/index/guice/IndexModule.java | 1 -
.../index/impl/EsEntityIndexBatchImpl.java | 3 +-
.../index/impl/EsEntityIndexImpl.java | 71 ++-
.../persistence/index/impl/EsProvider.java | 11 +-
.../index/query/CandidateResults.java | 7 +-
.../persistence/index/query/EntityResults.java | 6 +-
.../persistence/index/query/Identifier.java | 3 +-
.../usergrid/persistence/index/query/Query.java | 27 +-
.../persistence/index/query/Results.java | 4 +-
.../queue/impl/QueueScopeFactoryImpl.java | 2 +-
.../queue/impl/SQSQueueManagerImpl.java | 6 +-
stack/loadtests/src/main/scripts/gatling-mvn.sh | 16 +
.../_maven.repositories | 8 -
...14c97c6e3ef40c88590e1b196d3ec55b-javadoc.jar | Bin 160201 -> 0 bytes
...14c97c6e3ef40c88590e1b196d3ec55b-sources.jar | Bin 59744 -> 0 bytes
...63dec68314c97c6e3ef40c88590e1b196d3ec55b.jar | Bin 67751 -> 0 bytes
...7c6e3ef40c88590e1b196d3ec55b.jar.lastUpdated | 13 -
...63dec68314c97c6e3ef40c88590e1b196d3ec55b.pom | 166 ------
...7c6e3ef40c88590e1b196d3ec55b.pom.lastUpdated | 13 -
.../pushy-0.4-apigee.pom | 166 ------
stack/pom.xml | 2 +-
stack/services/pom.xml | 2 +-
.../notifications/ApplicationQueueManager.java | 585 ++-----------------
.../notifications/InactiveDeviceManager.java | 79 +++
.../notifications/NotificationsService.java | 35 +-
.../services/notifications/ProviderAdapter.java | 42 +-
.../notifications/ProviderAdapterFactory.java | 49 ++
.../services/notifications/QueueListener.java | 84 ++-
.../services/notifications/TaskManager.java | 17 +-
.../services/notifications/TestAdapter.java | 23 +-
.../notifications/apns/APNsAdapter.java | 200 +++----
.../notifications/apns/EntityPushManager.java | 75 +++
.../apns/ExpiredTokenListener.java | 52 ++
.../services/notifications/gcm/GCMAdapter.java | 142 +++--
.../impl/ApplicationQueueManagerImpl.java | 523 +++++++++++++++++
.../services/notifiers/NotifiersService.java | 30 +-
.../notifications/NotifiersServiceIT.java | 33 +-
.../apns/MockSuccessfulProviderAdapter.java | 38 +-
.../apns/NotificationsServiceIT.java | 67 +--
.../gcm/MockSuccessfulProviderAdapter.java | 33 +-
.../gcm/NotificationsServiceIT.java | 81 +--
61 files changed, 1586 insertions(+), 1699 deletions(-)
----------------------------------------------------------------------