From 3834c1bf3ea8f047486a176fd2bbebde3130a323 Mon Sep 17 00:00:00 2001 From: Askill Date: Wed, 29 Apr 2020 23:10:31 +0200 Subject: [PATCH] added loggin of req ip --- .gitignore | 2 ++ app/application/__init__.py | 4 +++- .../__pycache__/__init__.cpython-37.pyc | Bin 902 -> 0 bytes app/application/__pycache__/app.cpython-37.pyc | Bin 915 -> 0 bytes .../__pycache__/config.cpython-37.pyc | Bin 151 -> 0 bytes app/application/__pycache__/db.cpython-37.pyc | Bin 2886 -> 0 bytes app/application/__pycache__/db2.cpython-37.pyc | Bin 2924 -> 0 bytes .../__pycache__/endpoints.cpython-37.pyc | Bin 1913 -> 0 bytes .../__pycache__/search.cpython-37.pyc | Bin 2961 -> 0 bytes app/application/endpoints.py | 1 + 10 files changed, 6 insertions(+), 1 deletion(-) delete mode 100644 app/application/__pycache__/__init__.cpython-37.pyc delete mode 100644 app/application/__pycache__/app.cpython-37.pyc delete mode 100644 app/application/__pycache__/config.cpython-37.pyc delete mode 100644 app/application/__pycache__/db.cpython-37.pyc delete mode 100644 app/application/__pycache__/db2.cpython-37.pyc delete mode 100644 app/application/__pycache__/endpoints.cpython-37.pyc delete mode 100644 app/application/__pycache__/search.cpython-37.pyc diff --git a/.gitignore b/.gitignore index d801967..aa00257 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ data/recs.json backup.sql app/data/ + +app/application/__pycache__/ diff --git a/app/application/__init__.py b/app/application/__init__.py index b8758b7..fa7d78f 100644 --- a/app/application/__init__.py +++ b/app/application/__init__.py @@ -5,15 +5,17 @@ import os from json import dumps import application.endpoints as endpoints import application.config as config +import logging app = Flask(__name__) api = Api(app, version='1', contact={"name":""}, license={"name":"Online Dienst Dokumentation"}, api_spec_url='/api/swagger') - +logging.basicConfig(level=logging.DEBUG) api.add_resource(endpoints.RecipeList,'/api/v1/recipe/') api.add_resource(endpoints.Images,'/api/v1/images/') @app.route("/") def index(): """serve the ui""" + app.logger.info(f" request from {request.remote_addr}") return render_template("index.html") \ No newline at end of file diff --git a/app/application/__pycache__/__init__.cpython-37.pyc b/app/application/__pycache__/__init__.cpython-37.pyc deleted file mode 100644 index 2c9bb99fbbee3cc487088a6030b972d36a4fbb38..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 902 zcmY*X%Wl*#6pizkWTu%%r}RPD%yu>%RjjD03TRac34v60)`%#IZ&SB%5^SfytdPo< ze`psh*t6nOyk*57psu)1TeUdy@qHXS_xku{zu$9k{QCR-{TJ79ep}~mglIg+seU3b zhmpb&gc9LWS9sJDKJ|%>yG0;6v?D?qw!T+HqD#B2?H4`TLrzdEiI~Q>vA!74!L2vknVc#0g>-vB#Fa1#|^gE+4_*bd|+dF7j`@HP&yv@#Q)jToE>8 zqpuF0v%&m#&UEZ}n^>QwWpT*R}q<}>v% z&2x}gLU;~RVSqBa6kb-FUt|laTQmW{b_c02gTvYPPGi z1}GI=U(bH=R{^-on* z%C04^J}7Amm8~mYYDK&E=J+84H8|!u?cA&;N)oGSk{AzJ6oI2EjM=K%7eRYRts1Yn y(zNrc6@mt`YBaPh-e2F1wQNg_c16XS0`>@cY7Jq7j7Ur(ocOsB*>neF;Qj+Z*7>af diff --git a/app/application/__pycache__/app.cpython-37.pyc b/app/application/__pycache__/app.cpython-37.pyc deleted file mode 100644 index eb08c4c7b660497d70a2d25adefcb750eb31cf1f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 915 zcmY*X%TC-d6pizk$z&c310CqJm5{oc4I|VYLa02{6)G*WvrwZbz6=IC33fuuZ0WY^ zZeiK~=vR2#Reyn1uQSl9j(mK4U-5nHce{~;>vfTR`tCZ;FMD}fO(bt|>z@eBVMI8R zP$FIGN{@Qdr#`WAR|K*_8?s58_1zPpY|&QDeG$nvZPz>y9oj+rhUm&3?LEqtWS{mQ z`LZ0)LCu?DMXu6S;sAkXw}cL%1w$6H7K=DRY$JA9_gg^MU;x8-0Bd*a(7$-jdiO4R z4ev&5>7KAYTmI^x{|gpOo$=r|X5x%}6TB0NzBEk*R~6{ekeOLhkTFnk39=AL31ioU zC!q66rC>rdEE1(*OpLcza6J5jk4JkVJqLMX$d>W5M1pbVFOD<8 zGuSxfkm+*cFu$xMWMxwFJezkWNx>)jb26KO!iP1lL1|RbW}2f-TAHTdDLMk}pk=HJ zNaIS0`KWfh-kKEXkY|$}T`Hc@^33bZg`kg5C*B;sk*7V-N=h7=a82ATH(r5-AK(3@MDk44Ow+|0bhqL{>j0uav0OinDx%+HHS d&d*EBOxG)@yv1RYo1apelWGSt>oX8D003@ACr1DP diff --git a/app/application/__pycache__/db.cpython-37.pyc b/app/application/__pycache__/db.cpython-37.pyc deleted file mode 100644 index 79748b6304f0f65d2e2c5c231d4db8305693f27a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2886 zcmbtWTW{P%6rS;Iz1~ZlO$u!(lshb!MB-X1E+q{`6;&SEN`+Ct@_Hs4XFc|I?1d)U zz(aWLKR_sXMB*3CD=+i`iDzEmobi$kB?2UD&GDJb8PEC7WzJfs6A*ZQ3BUj1N8oMm@ClAUx9GKX+{`@uayyLF-zLamJV~I%UtO(Pc~RX`plP2)|3GYWQ(|5@#Sv`yC^PlazNo<^cLx#c>r3Ijec8uSBq>SbM4)#RGJTU<9c3+p-{T9F_A*0 ziFR+tgG^|DJ+8#E_CZgtcGGO&11Ez zosaT~)Xr^juj<>nU5c_yi(JMd_(@xdEUutiZl`0tkeIVXV^xfWs&@NS`y95d;IF`k zTqIenVEvaO8pI`zx!1C|9PO>h-STesvY~u%d39A4MRlbV>Pw+kx5^Ka?O2tfdT&x~ zU6O-0u4xCk^k)?7mRD!1<-lwcFh?9{LTi`Hil8+J!BKV-F3+*bj@_8UbvQO__n35f`PCoDLTT^;S zr`Dl$M2^5e@3!xdDf%eg0Cx$%9Bge6xo)hnWpIvM7<0@_-!@0 zya`UUBa*7z1UD^{?MXf?OCixEH({SFO^n}d^1;e@SG@pI7w~*O5JDZ=raijXtHE43 z@xRlxdIf}1)avP(R%bygYX`L2v4)@@XlEahcmJZBqn-mPy*S@Iie)hYODz9wD3TL% z#J;Uw1R>Q&@)8nMw0r^_Ofh-X}j71Z|KaDepV#KU`1PEBx3TW4I zYzJ(NuSMI|UN{5gSYV^Sr2Qzuh=?K`M3F4`BtyO(MRzB0Hk;{0QH9B|?kWopgb>z8 z?;!V(vMn4l8ZRJcT)>5Z%SQ$RwTh#!A(>m&aA;n24oDB0QO1Ykhcqy62oBq}e9!mH zngrGyKgS8`1`Pe51SMQZQ2v2QPrM114b(HRWvxVK?s;{xQ5a9^aU=$VSCLx*vKQ7l zX{G+a>WzL!y^hmwAbAtXTS(@3Uc&Ai&*QyR6DN#UorV`4?=rNq4det~mO1$8DB-XE zD@uS!lY0gcxVHfjUp))r>TMv}H)cH*jME@!{R;%|;Kp+Z{#kK6#X2+-{4>QZbGGA9 zM{uz`x{AvNKz755?9fB2vM~+cA^8o5RL&?+n-r1&C3`ECJEd4cOreN)o9yG)8WDA) z@(vr^NLBvS6d8B0Bm$|g>8Io~l3Slb58!b&9^kF;0M&SacS66Zoi(`0wJ${#V-&Ms zR!YQKroCA`(fsIMBF1qA1zU0X!`ULUB(0gU_i5$Esq9n_+l7@4L|q; Dh-a9Z diff --git a/app/application/__pycache__/db2.cpython-37.pyc b/app/application/__pycache__/db2.cpython-37.pyc deleted file mode 100644 index e56af5b2ea4bfc960af949237a691f13adc72f77..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2924 zcma)8-EQ2*73OeBF3IKoNS0+=`K!~k$u_Ojx=x!qX{y+Xiy($BYz0XMLI^HrB+<*^ zZid{%GMwf@xfPH{NPyn-P5KOT+neeYdXs)+*bh)RF`*E$U_zJNX0x> zJ>F9ZPgI}x8IA9h12yDBHR2<+#FuQHS1zk%js?)}mzUHEU$HtXFZ0W&3(8e>g{yglV7{MM{ z`vurbVj1?bwO@pNNvyzLvGz-_FN;;!tJeORxF)WMtKTqwU0y$Q;0=4=jMt6{sjYEh zf;+Qvp(+zRXmnBSneGQwBln~>-K~X^y2y>colQzTRv*W9h20uu8UcvvMClxv@Ej* zX1!m`%`msVq;ox+OWhodnF$4^ZLlizk&trjx9uI{$8&)zilt>Y)C-eBDYh zxwWyOXR~Irmih~+H+JhAf64bVUCZXri)QytHMx1$c%&8o?l{iaGoH-%XC{g1Ubny3%JRZRIW%tnKA+*415wxz=VrZf45lxO5`XsP>wxurzA`wjVL6o5wAdo{7 z+?RPVmnP8dH)_9WA-3UeZ>|f4D5O()!29HNQ6W}JR*mth4AD%As&4cmw^1;ig)U8} zPq6JrZjq`Xrtw@dAk#N%Tm(MB+M$A%uw$ zFSt=)L;rB}nCeOV=jNSTJK)hnnK$(gm|Exii)yc~r6N}DWb-+dvdAs{cEsey`usp& z#n2^`dIS+NkBwMt|Ma!3&&1nDuTAQHal8>bigZW%(7G}dh`I<6y9hcZ0@4v}*^`Ng z4jIxy@2JE3s6m_$8EX4ywI}h`FJnD!gKRf$mYxETW@@%TU{`)rm8ymHUcZLXW2S$O zkBQp|5_I|+Djtto>a3q*5Yx}0<@le}JbXIsIt2}Z)~}#J|ANFXNxVwJM$*RbbuxcV zf?{PCu^zN>j;PKCo497qO>fEbG?=aSE9y?WCy(j@MCf`H95-Q!yUc9c#o@Vy&KDg= zfQyg-avVVs;9zwTkPv!!qDLaaA&d2IFhT3NrQ|xyZNNyL*kw;4?X{3@>qRx)!nmJ= zhj!f3`wSTq;22iZ`oeva0~EVDgdk!rvxHfllX`vlKcFxlQML#+;9x>YnE`-Za)b%=rp6kJlUj2|I-L1aF2v zI$zP(ojUqn6MWYdc2pBSaj3_~^ajGHzp+o8Po2vB1QsChwvK7}W6A}`lq<)P@owYd zHldPDhO0f}@yW{}D@zlcJRhR>ALVjR7n1RDf6-M%PXOcBrId4ALRHbccN@1`H>Z4u zcLbB?P_c<(6U)7gVl%nJTx9YQ3+*47oLT`tc{hHU$9OwrWxg-ffpNv8OW?HT`8I_7ru6`4_-y<=iW7X86EH* zp(m5SOK%%}iN?J{;w=(?q7K~$?JKHH>Xa1QQ$@^fdACX01xzvF+wFb)4sE`sp&@&d btstEwKnKNLaRZikqj=OG1*32j#PNRty3d?S diff --git a/app/application/__pycache__/endpoints.cpython-37.pyc b/app/application/__pycache__/endpoints.cpython-37.pyc deleted file mode 100644 index cd9217ce0b86452ccf8cc4ce6bc98eb1c1399ebf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1913 zcmZux&2Jk;6rb5Iuh$=OLMd&Lis=C`2Ln;nLls34M4(D2Ldk6vYHfDL?mGM7ycr{6 ztxw6dhu%5Z7bN}(Zb0t<}Ri z&Q2O+jj)k5!{&Owm9@k6n%~MgVQ0;6huc3e;R^4X2~YAXJKRCJCVZ6rO8!7tC#+Y0 ziypF`W&C5QiYdg>_#iJP5h!`ofDcs(lJLh`g|N7j_+`&Kaps5#WWvSx3j%)mTb;TK6VAyp0I@d z+UBg}iyE$5CEoIo&28Zb_nMXVA-m#pTl)(icO6|{1f{*?b9cSs>4xx1uXG+@9f}))#>*IsQA@1A1NiXB#+<}eWH;jaYW9X zqJxtn$+hZFF5d-vDV3+lCi@?uEkz!BZ1&`R>G~t7`+I2-N2%IJ=0<(iz>O|ct)UDL zW=+(HyTvaO(&*ASBGS>@ztLQ82PkGBc$k`6H5J$-wT|V*R4V-wH6EB|B*Y+s(KM5} zHn!4Wf~qHJQDIJ#40Ebv1o5j7Ez!Jd+zDVbA-RKIA11Nh4Lyt~OSEz0v{2Hx!!%Oo zrj>?=qhs1P#tRRz<9qusH$MA+i&m;Bs9zP`lg zjNq$-MWX_$t=YI)+Vp6>CP3AWj4J^On6;0J?u)~&no{pdk-R}XRG6666LRsZNj}22 z%FnPX2yMLT2Dr8&;d=~M6th%M=z^7!wN(6jZ*{z(|s6-r^bknT-gN$%Y8w2KsATzQ{N+f=3={9pXqx7c>T+6xpHsFw=(EQVF`Mz6&G~}O#EC4} zUH0H`W))&Ca@M!{Hl)*c7h>)$=Y=&83qJQTtCW4U>}zH3ps(XRTXHF$vckU0&UnEK ztHUO(16GjH*8K~UL}}7KnY01XV+DJ#N@f*YvQ2FMlbG1p#GlhM@GL9KRay7v ze`Try^|$YLKRg_(Q9tVD+2JQ6m31FY(_WTE!#EAqVK^RBOX6;r$D{Nxi$c|Xv^zfi zw%SSJEboqnailBC^bcdH-QzexG_>6x#i_2{OM5Dk%RSZQB#zQtSFm$A)mE4! zZAbfYI-ceqDQt~Xd7>-wsJuFWVm#IS#5iFoD1WtAnqQ+QH6a+cxzDTohkRSC3-u;6 z7cro;aM4U!{1StnNsB(G5dM+RL@sh`j({%s8J}4vZ<|Efnc0PngmBf~;+bFHo0{XYVGzSH4IZk&QHR$Hw}AH+k=~ue4tnM)6thlc;9Mw$VjyBo+YT=nk{h1<_zwtg|e)4JI z&e!Rl2c1JPtIVqTH9)tDH`Y$Ji&|lkl>_$~S6f9*+8?l4?HQl21D0Izi&+J0Dw}N9IQI!&R(hdm7;?D|@@N)~qS@a@dsDiXJlN`Q zlXv<%prp%w^8fFY(p$%NQ7x1gD zU#cH#9%~B*YsWZ5d!wZpfnRRjGw*>_VE9+OtZSEo|6Sady$8X#FKp2?H0+BnK**~Y z`@GKUVjX=8M6?PzS`{{@`3~RW9j-pX&X>}IB0~wAbszwTlBWN_UZQCvOb+rn-{1s9jW zfdjsW6&G2TK=C#dufXFT9aYxX4Wi@M7FS2zq^;i}@fHbst0FH_(NBJ?zE5*P-}x<6 z@r(gK#~`B_gHxMmt)*cXoK6oS_uWCu$gvXD?c`llFJ@Tp7OLA$VS%aEO?3m;sf|KN z0d^F>Vv~&nHfe%KL=N|!@$1kQ!hFye5E=l&3&aE3N}?3?>QfqvWKVnD<=0psl0^Li z+Edg|airQ;^~$A>n_YQ?tb{Po z20oH78z}O-@oZ3|%DdYgsqr*hmRdWHQF}kY3SH}tk^~=7_^v5Apmh{>2R#MjI-c-i I_x$?*0Ifr?1^@s6 diff --git a/app/application/endpoints.py b/app/application/endpoints.py index e1af191..63ba9c4 100644 --- a/app/application/endpoints.py +++ b/app/application/endpoints.py @@ -44,6 +44,7 @@ class Images(Resource): session = Session() image = session.query(Recipe.img).filter(Recipe.recipe_id == id).first()[0] image = base64.b64decode(image) + session.close() return flask.Response(image, mimetype='image/png')