shopizer-memoizeit
Details
docker-compose.yml 8(+7 -1)
diff --git a/docker-compose.yml b/docker-compose.yml
index a3b3021..b83e8ea 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,14 +5,20 @@ services:
container_name: shopizer
depends_on:
- "database"
+ - "elasticsearch"
links:
- database
+ - elasticsearch
+ command: bash -c 'while !</dev/tcp/database/3306; do sleep 5; done; bash run.sh'
environment:
- JAVA_OPTS="-Xms4096m -Xmx6124m"
- - TRACER_ENABLE=true
+ - TRACER_ENABLE=${TRACER_ENABLE:-true}
+ - TRACER_MINIMUM_EXECUTION_TIME=${TRACER_MINIMUM_EXECUTION_TIME:-1}
- TRACER_SERIALISE_INTERNALS=false
- TRACER_VERBOSE=true
- TRACER_TRACES=/caching-approaches-comparison/applications/traces/shopizer
+ - TRACER_IGNORED_PACKAGES=/caching-approaches-comparison/applications/uncached/shopizer/ignored
+ - TRACER_WHITELIST=/caching-approaches-comparison/applications/uncached/shopizer/whitelist
- TRACER_LOG=/caching-approaches-comparison/applications/output/shopizer-tracer.log
volumes:
- application:/application
diff --git a/sm-core/src/main/resources/configs.properties b/sm-core/src/main/resources/configs.properties
index b3f007a..b710686 100644
--- a/sm-core/src/main/resources/configs.properties
+++ b/sm-core/src/main/resources/configs.properties
@@ -6,7 +6,7 @@ secretKey=7070200000000007
#Elastic Search configurations
elasticsearch.cluster.name=shopizer
elasticsearch.mode=remote
-elasticsearch.server.host=http://localhost
+elasticsearch.server.host=http://elasticsearch
elasticsearch.server.port=9200
elasticsearch.server.proxy.user=
elasticsearch.server.proxy.password=
diff --git a/sm-search/src/test/resources/spring/shopizer-search.xml b/sm-search/src/test/resources/spring/shopizer-search.xml
index 8859040..e033eed 100644
--- a/sm-search/src/test/resources/spring/shopizer-search.xml
+++ b/sm-search/src/test/resources/spring/shopizer-search.xml
@@ -21,7 +21,7 @@
<!-- local (embedded version, will create new indexes in the working directory) or remote (requires existing server) -->
<property name="mode" value="remote"/>
<!-- those properties are used when configured for remote -->
- <property name="clusterHost" value="http://localhost"/>
+ <property name="clusterHost" value="http://elasticsearch"/>
<property name="clusterPort" value="9200"/>
<property name="proxyUser" value=""/>
diff --git a/sm-shop/src/main/resources/application.properties b/sm-shop/src/main/resources/application.properties
index a53e412..f991c9b 100644
--- a/sm-shop/src/main/resources/application.properties
+++ b/sm-shop/src/main/resources/application.properties
@@ -1,5 +1,5 @@
-logging.level.org.springframework.web: DEBUG
-logging.level.org.springframework.security: DEBUG
+logging.level.org.springframework.web: ERROR
+logging.level.org.springframework.security: ERROR
#Default Spring white label error page
server.error.whitelabel.enabled=false
diff --git a/sm-shop/src/main/resources/log4j.properties b/sm-shop/src/main/resources/log4j.properties
index de9e11d..76fc29a 100644
--- a/sm-shop/src/main/resources/log4j.properties
+++ b/sm-shop/src/main/resources/log4j.properties
@@ -2,10 +2,10 @@ log4j.appender.Stdout=org.apache.log4j.ConsoleAppender
log4j.appender.Stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.Stdout.layout.ConversionPattern=[%d{ISO8601}] %-5p - %-26.26c{1} - %m\n
-log4j.rootLogger=INFO,Stdout,debugLogfile
+log4j.rootLogger=ERROR,Stdout,debugLogfile
-log4j.logger.com.salesmanager.web.shop=INFO, debugLogfile
+log4j.logger.com.salesmanager.web.shop=ERROR, debugLogfile
log4j.appender.debugLogfile=org.apache.log4j.RollingFileAppender
log4j.appender.debugLogfile.File=shopizer-debug.log
#log4j.appender.debugLogfile.Threshold=ALL
whitelist 2(+2 -0)
diff --git a/whitelist b/whitelist
new file mode 100644
index 0000000..8421594
--- /dev/null
+++ b/whitelist
@@ -0,0 +1,2 @@
+com.salesmanager
+br.ufrgs.inf.prosoft.trace
\ No newline at end of file