Retuning and frontend updates

evecentral · Jul 7, 2015 · 43c0c41 · 43c0c41
1 parent d5ccfbf
commit 43c0c41
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 9 deletions.
diff --git a/core/launch.sh b/core/launch.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
-JAVA=/opt/jdk1.7.0_67/bin/java
-ulimit -n 100000
 
-GC_OPTS=" -XX:+UseParNewGC -verbose:gc -XX:GCLogFileSize=10M  -Xloggc:logs/gc.log -XX:-UseGCLogFileRotation -XX:+PrintGCTimeStamps -XX:+PrintGCDetails -XX:+PrintTenuringDistribution -XX:+UseConcMarkSweepGC "
+JAVA=/opt/jdk1.8.0_45/bin/java
+ulimit -n 1000000
 
-su evec -c "$JAVA -Xms10g -Xmx10g -Xss1M $GC_OPTS -jar target/scala-2.10/eve-central-ng-assembly-3.1.6.jar" > /dev/null &
+GC_OPTS="-XX:+UseParNewGC -verbose:gc -XX:GCLogFileSize=10M  -Xloggc:logs/gc.log -XX:-UseGCLogFileRotation -XX:+PrintGCTimeStamps -XX:+PrintGCDetails -XX:+PrintTenuringDistribution -XX:+UseConcMarkSweepGC "
+
+su evec -c "$JAVA  -XX:+UseAdaptiveSizePolicy -Xmx23g $GC_OPTS -jar target/scala-2.10/eve-central-ng-assembly-3.1.7.jar" > /dev/null &
diff --git a/core/src/main/scala/com/evecentral/Boot.scala b/core/src/main/scala/com/evecentral/Boot.scala
@@ -34,19 +34,19 @@ object Boot extends App {
 
   // "Singleton" actors
   log.info("Booting GetOrdersActor")
-  val ordersActor = system.actorOf(Props[GetOrdersActor].withRouter(new RoundRobinRouter(30)), ActorNames.getorders)
+  val ordersActor = system.actorOf(Props[GetOrdersActor].withRouter(new SmallestMailboxRouter(60)), ActorNames.getorders)
   log.info("Booting GetHistStats")
   val gethiststats = system.actorOf(Props[GetHistStats], ActorNames.gethiststats)
   log.info("Booting StatisticsCaptureActor")
   val statCap = system.actorOf(Props[StatisticsCaptureActor], ActorNames.statCapture)
   log.info("Booting UploadStorageActor")
-  val unifiedActor = system.actorOf(Props[UploadStorageActor].withRouter(new SmallestMailboxRouter(10)), ActorNames.uploadstorage)
+  val unifiedActor = system.actorOf(Props[UploadStorageActor].withRouter(new SmallestMailboxRouter(20)), ActorNames.uploadstorage)
   log.info("Booting RouteActor")
   val routeActor = system.actorOf(Props[RouteFinderActor], ActorNames.routefinder)
   log.info("Booting OrderCacheActor")
   val statCache = system.actorOf(Props[OrderCacheActor], ActorNames.statCache)
   log.info("Booting UnifiedUploadParsingActor")
-  val parser = system.actorOf(Props[UnifiedUploadParsingActor].withRouter(new SmallestMailboxRouter(10)), ActorNames.unifiedparser)
+  val parser = system.actorOf(Props[UnifiedUploadParsingActor].withRouter(new SmallestMailboxRouter(20)), ActorNames.unifiedparser)
 
   def catchAllHandler() =
     ExceptionHandler {

diff --git a/core/src/main/scala/com/evecentral/Database.scala b/core/src/main/scala/com/evecentral/Database.scala
@@ -9,7 +9,7 @@ object Database {
 
   def coreDb = dbconfig
 
-  private[this] val poolconfig = PoolConfig(maxWait = Duration.standardSeconds(4), maxActive = 40, maxIdle = 40, minIdle = 10)
+  private[this] val poolconfig = PoolConfig(maxWait = Duration.standardSeconds(4), maxActive = 60, maxIdle = 20, minIdle = 5)
 
   private[this] val dbconfig = DatabaseConfig(
     driver = "org.postgresql.Driver",

diff --git a/web/templates/tradefind_display.tmpl b/web/templates/tradefind_display.tmpl
@@ -63,6 +63,16 @@ checked="1"
 </form>
 
 
+<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+<!-- Big Banner -->
+<ins class="adsbygoogle"
+     style="display:inline-block;width:728px;height:90px"
+     data-ad-client="ca-pub-8691225504311148"
+     data-ad-slot="8769907779"></ins>
+<script>
+(adsbygoogle = window.adsbygoogle || []).push({});
+</script>
+
 <p>Found <i>$num_trades</i> possible routes
 #if $fromcache
 (using <i>cached</i>results)

diff --git a/web/templates/tradetool.tmpl b/web/templates/tradetool.tmpl
@@ -6,7 +6,6 @@ Trade Tools
 
 #def body
 
-
 <div class="tradeTool">
   <h3>Sell->Buy Order Tool with Jump Distance</h3>
   The traditional NPC or player order matcher tool still lives on. Use this tool to match up Sell and Buy orders between regions and systems.
@@ -41,6 +40,16 @@ Trade Tools
   </form>
 </div>
 
+<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+<!-- Large rect -->
+<ins class="adsbygoogle"
+     style="display:inline-block;width:336px;height:280px"
+     data-ad-client="ca-pub-8691225504311148"
+     data-ad-slot="4894042237"></ins>
+<script>
+(adsbygoogle = window.adsbygoogle || []).push({});
+</script>
+
 <div class="tradeTool">
   <h3>System and Region Price Comparison Tool</h3>
   <p>Compare the price differences between sell orders in two systems or regions (or combination thereof). Simply enter any system or region name in either box, and pick a matching entry from the list. </p>