From ceca1a658d46b1ab9b7db63840cb342681c2e5ce Mon Sep 17 00:00:00 2001 From: elroy Date: Mon, 10 Jul 2017 22:55:16 +0200 Subject: [PATCH] Update keystore and fix gunbot location check --- pom.xml | 2 +- .../gpi/controllers/CheckSetupController.java | 2 +- .../gpi/services/GunbotProxyService.java | 8 ++------ src/main/resources/poloniex.keystore | Bin 2276 -> 2293 bytes 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 03726dd..51a755b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ nl.komtek GunbotProxyCommunity - 0.9.6 + 0.9.7 jar GunbotProxyCommunity diff --git a/src/main/java/nl/komtek/gpi/controllers/CheckSetupController.java b/src/main/java/nl/komtek/gpi/controllers/CheckSetupController.java index 50d3beb..20ef12f 100644 --- a/src/main/java/nl/komtek/gpi/controllers/CheckSetupController.java +++ b/src/main/java/nl/komtek/gpi/controllers/CheckSetupController.java @@ -93,7 +93,7 @@ public class CheckSetupController { if (!gunbotLocation.startsWith("file://")) { setupData.put("Gunbot location", "Your file location should start with 'file://'"); } else { - File file = new File(gunbotLocation); + File file = new File(gunbotLocation.replace("file://","")); if (file.exists()) { setupData.put("Gunbot location", "Looking good!"); } else { diff --git a/src/main/java/nl/komtek/gpi/services/GunbotProxyService.java b/src/main/java/nl/komtek/gpi/services/GunbotProxyService.java index 8231d10..9b88531 100644 --- a/src/main/java/nl/komtek/gpi/services/GunbotProxyService.java +++ b/src/main/java/nl/komtek/gpi/services/GunbotProxyService.java @@ -10,7 +10,6 @@ import net.jodah.failsafe.Failsafe; import net.jodah.failsafe.RetryPolicy; import nl.komtek.gpi.utils.ProxyHandledException; import nl.komtek.gpi.utils.Util; -import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -177,11 +176,8 @@ public class GunbotProxyService { .onFailedAttempt(this::handleException) .get(() -> analyzeResult(publicClient.returnTicker())); - if (logger.getLevel().isMoreSpecificThan(Level.INFO)) { - logger.info("ticker updated"); - } else { - logger.info("ticker: " + result); - } + logger.debug("ticker: " + result); + return result; } diff --git a/src/main/resources/poloniex.keystore b/src/main/resources/poloniex.keystore index ee0d0a000c1cf9ca658fee5d94ac21940ffc1fb7..a906f963ccdcc8812959d41ff0f41a6c8c685bbe 100644 GIT binary patch literal 2293 zcmd5-c{J3G8lK-Q)-kf1MTP9rZzh9^5VE9^GTD=4iI}lRAww}}K^JjJh%DK+7G)i~ zv5aLwf3E=XUNr-~Znq?;p?eocEmfJm)#jyS=!*2!TMLy94|&NGjzj z#pjCaH8mHC_b%zEc9MGu0zm*E4Za1UxcF4K063rw6#@VR1Wtqh7IxN4(6~Qpn!6Gk z>znnaPuoIn$ZlctpgtIVK25{gzGWz@^?p!Pi~`YV{CoID^p2{!g^o-t;%B0e^6cY< z5SG8Kr9H2Co)Vd6lj$woZ!A&qF^UfJ}WU=zrSqvkb_ zTGhU_bM3TUPA5TY-fM^Os{8#;x9@mjHJ9%to)|iSn5Sk1pB;ZVx%xDvKJD2N9%fd5M9MgB_40?~ni8_oAbPr;wC4S`1$zTS6ReW0auv=i zbQom2_*jkV_BtP`1X@c!U3|7KjTXvgjHFvqc?6lBDY=CsN)K)DPbXd!?;oNz(F?!_ z1JY=cNB0S(&$IwbqEYm{Qd*x}*vy=VnMY6tQKQWE;0a@P@utDieRp`qrNVXMXD5U8 z#!oWN>!oT=c0Ow8dl}m1Hq*SRbfECi)Q&=m04(c*OXIfG%|p5{J-?!)1h#(Y#+RG3 z=q338<@6@#RlN4_@N<(3+wC$~prU?mMvGeSJ}R-O?Qz2~bJ(wg#eKJ!QzGBhgnDx* zwuEiDQIre|FhLtul=knPf+`VbtG*jzvNSdEd>_w!op*WqK$UDjtM<#n?&dlB+CVPH zPO?r>xUO=YLL6n{nn<+DL%qtAMq&Dh{?%y=_UXpSTIbe`ws!&f2;rl2J%@r>`tO z@|3l?SjK_}S&Ihey<11+13fjY?#p}#&_m~*eKPrlHNQ@qjEa%p1|KnUZAyW9Nn)j` z+NWNHeqdEiwz#lxz19vK)A9|GLZDmm8 zS_EgdeHFVGqs+X(Yg+oe0J-L7Zs%!KK6mc-g@9DeYdy}YSyKjM`p3I_7^Rqm&Cgek z8`N`hD0+2BGn7IauR2&uF?&>O;c&@cTtIO9Q=C8Q5n-c7 z1dl)qLu>Tdny%GX=O;8gL5O8Xccse;ozLr)BiiZQY%$EiDH&gZ6h{Ve)=s7o{bK}X4{^G|I<@OV*I zSLXX{x4q}ik)5nhM7V7SNrzQE^~zj)6~`k(|+3Cd(XY zAX|4S+S}qq(uY8QWP7a<2khO{w$eE; z#t{8#bVD!`HnP4W?C_*;l4H85hI$Bv0T3Wp8r%m;?Z!e11s8{l+Tpuxf&?x#=mp1@ zn%SjytKsrJel>A7f4e3Ekh1~2HO{6ZCSS_5r)*D===2Sicw&&R+sX{l+r6RtOJ2ca zlQY`wxBRX?p&l`c1H!U+hweWgOnpE3NM1xSV`!=;^@$Nq| zc$Ocijo2h$H?Ir`n3h#eP#(Y64=)}{<**=zZxL=LiD?CKQ$B$UMB4No|AQY*H)Ys8 z0gF5v^}{4NulUd0m|7OY{G#YstxHSK8LSd}%T`K@|I+7%x-F)bwodbt+}2HjQpRwT>WUn+=iEPAIATYOAj%k@7 oOR^Y+8z&cY_}6>}S7A5ByeIg-55JH;dbBztT4S4XwfW4y0O3>MumAu6 literal 2276 zcmc(g={wX58^>p}j(tyNMkd+$4W=6Vo~DMe4@V(OS+X;>EEAP|iBJraL6R+!wNmzz zeW_3($zB{=YIvNk^IT8Y`3IgC_lxi6x?kMa_r9<1y}!D@3Ic&3hXwvsT(XM3K3+cF z?yez<&OTQUvHerZBo_$81OX_peSnLZU5*(H1It2q!C)p3i~?I46AcJYJN@|-n|%bT z1ogTc3AZThOGwolLtpcs`E$1z!TFxnrVv%`%4pRMV*g55J4M+Tzh&>TF+Ux!_DxM( zTxRl1R>^vrdZM;?f+?M%642wM95I*f>$dpLDLi=biuQuJhK0ClaoSPNWyG%f7-0OdMT z1+|buE|O&%dhc^NElK}oS4Vto7OPc=Obfxbeq}qs}^=uQ1`YE)JZO%52s#-M!_Kx%LvSC?8g}$+<~L5X%_s zPS((U+Vie^V{@>ye{|1`N=nfRafGNichYg6GYmEKsF|$}iNWS2S#HCB@aZ?HNn7`v z&!o57&^H`hqqbS6L75%^oO&mrbaP4l>jW`1+OR9lUgm_*gumJ3&dspkCrxO>Zcoh^ zLARr*wu^c9bBmI@`?fM%_p4x~>rC5b%ILhH5$B`&pE~x5^`wIb_=dK6X>mdm*l+v5 z%SAvK!|*dNozW?%+w(;C&%J0EEZ0_0(+;W}4?kp}T=qDM=DUM|BP58Ad zCEv|Sm?%bvS9IHXon~omPpNu6$57)Mf^HECrF0G!ZIabJtd%idx_ZO5OrBG`V};I3 z6;bX8u7nTF`v>bO$!A%bnnX|2Y`Fxx<0I(x>Ypvy{_NN)Vq@~mlzYV-F zF&A7NFEny$C5!rVh@C{U&6<9cV5AR+q?C&Bl1$z|*rnM#)JO5RAUtNfyw)y@C=Usk)cG;I%*(9*w z!mTY6pJh%Snb6p+_2mwCwj7@EM4_$v{`GcAp~<)t*(pH=fD>7=Y?W;i#rQm*ai>`! zW=7m9$9|k2pB|0~6}w<7`E{>`5|e zpEVWAk7d=`TlO<|2=a;WH0`4+HrO8U<$sv9-PNzyxM5-1a}LfRpY`Jbp+ZNC4KeRT zboQv+D?_^X$qfP3x`UP3(v)wkg7gg1Fmg56?wc%L6gG!_elpOMwNmJg9QqiL<>V{H z@6wjvIru(Hy8ChS=}I+X#~9Tup@MHK`TLa>Fˑj}O&uf$vrw~;H0qnSFp`52l+ z66&b*k%)f(y4M?3l0QoQBbJvw2J&X#F#a^qd0`kDAv(ZjbiM8}2=U45QX*V0S|4K+E zk|Gwsfk4pP00o)~P$1+&C!hmjj&4Y_d0uZ|rb_!Eh!J5Q2dNY|KzA7&AY_ zz2EH-Hr8 z#GC?7VoqUj$|@?VcE2PJgZ)STA19-LC4RT*@QXkxU~UjV0kcCWU@)lWQKyXDGowlu z1No?i1m5yEL3ahWV#)MawasbWRXN~7jaM(sqfrsfg1oaD73%|Or8!F9IVV0sRKqI0 zq@P)v$lo^2?x_W7ilVL{!)@d<>L8z3>>MIz&<@$lCPhKuYhG4jl9}9w`(JjSz_o0* zzJDdnUlCn*B??GE@VqMAbPH&i<#OHGM_RlJVG(G~fZc`FNX~w62nT=%5j`So(_$g$ zkhLYwIX9MsRC0d9hwX>Y+$XmQ)O-=NmfxV8YAy}xTVXfw1$mqSH_&)GCH$uJvB1LB zKp)(bH<9{s&mLOfz2q&sz4bh7pWdZrQ3z&UJ&AAJrWZzgKS7{i5V+_VfC3PQt3`0Z zgkS=}!qJZUiW@N=1BBi*RSIZR;9PpydaYRi? zTnlMlyX)r*Rqt1?zWKH;#3S-53Lo4;ATIeFn46;b`z*07FDIu z7lZB~*5_$2GdN7%1!C8;GphrP5;tKFNu(N?P