Current section

19 Versions

Jump to

Compare versions

7 files changed
+69 additions
-73 deletions
  @@ -20,5 +20,5 @@
20 20 {<<"zotonic_core">>,
21 21 [{<<"app">>,<<"zotonic_core">>},
22 22 {<<"optional">>,false},
23 - {<<"requirement">>,<<"1.0.0-rc.0">>}]}]}.
24 - {<<"version">>,<<"1.0.0-rc.0">>}.
23 + {<<"requirement">>,<<"1.0.0-rc.1">>}]}]}.
24 + {<<"version">>,<<"1.0.0-rc.1">>}.
  @@ -3,14 +3,13 @@
3 3 {require_min_otp_vsn, "22"}.
4 4
5 5 {erl_opts, [
6 - {parse_transform, lager_transform},
7 6 debug_info
8 7 ]}.
9 8
10 9
11 10 {deps,
12 11 [
13 - {zotonic_core, "1.0.0-rc.0"},
12 + {zotonic_core, "1.0.0-rc.1"},
14 13 {gen_smtp, "1.1.1"}
15 14 ]
16 15 }.
  @@ -2,11 +2,11 @@
2 2 [{<<"bcrypt">>,{pkg,<<"bcrypt">>,<<"1.1.5">>},1},
3 3 {<<"bear">>,{pkg,<<"bear">>,<<"0.8.7">>},3},
4 4 {<<"bert">>,{pkg,<<"bert">>,<<"0.1.0">>},1},
5 - {<<"buffalo">>,{pkg,<<"buffalo">>,<<"1.2.0">>},2},
5 + {<<"buffalo">>,{pkg,<<"buffalo">>,<<"2.0.0">>},2},
6 6 {<<"cf">>,{pkg,<<"cf">>,<<"0.3.1">>},2},
7 7 {<<"cowboy">>,{pkg,<<"cowboy">>,<<"2.9.0">>},2},
8 8 {<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.11.0">>},2},
9 - {<<"cowmachine">>,{pkg,<<"cowmachine">>,<<"1.7.1">>},1},
9 + {<<"cowmachine">>,{pkg,<<"cowmachine">>,<<"1.8.0">>},1},
10 10 {<<"depcache">>,{pkg,<<"depcache">>,<<"1.7.1">>},1},
11 11 {<<"dh_date">>,{pkg,<<"dh_date">>,<<"1.0.0">>},1},
12 12 {<<"diffy">>,{pkg,<<"diffy">>,<<"1.1.2">>},1},
  @@ -20,22 +20,21 @@
20 20 {<<"erlpass">>,{pkg,<<"erlpass">>,<<"1.0.4">>},1},
21 21 {<<"erlware_commons">>,{pkg,<<"erlware_commons">>,<<"1.5.0">>},1},
22 22 {<<"exometer_core">>,{pkg,<<"exometer_core">>,<<"1.5.7">>},1},
23 - {<<"filezcache">>,{pkg,<<"filezcache">>,<<"1.0.1">>},1},
23 + {<<"filezcache">>,{pkg,<<"filezcache">>,<<"1.1.0">>},1},
24 24 {<<"folsom">>,{pkg,<<"folsom">>,<<"0.8.7">>},2},
25 25 {<<"gen_smtp">>,{pkg,<<"gen_smtp">>,<<"1.1.1">>},0},
26 - {<<"goldrush">>,{pkg,<<"goldrush">>,<<"0.1.9">>},2},
27 26 {<<"gproc">>,{pkg,<<"gproc">>,<<"0.9.0">>},1},
28 27 {<<"hut">>,{pkg,<<"hut">>,<<"1.3.0">>},1},
29 28 {<<"jobs">>,{pkg,<<"jobs">>,<<"0.9.0">>},1},
30 29 {<<"jsx">>,{pkg,<<"jsx">>,<<"3.0.0">>},1},
31 30 {<<"jsxrecord">>,{pkg,<<"jsxrecord">>,<<"1.2.0">>},1},
32 31 {<<"keyserver">>,{pkg,<<"keyserver">>,<<"1.0.0">>},1},
33 - {<<"lager">>,{pkg,<<"lager">>,<<"3.9.2">>},1},
32 + {<<"logstasher">>,{pkg,<<"logstasher">>,<<"1.0.0">>},1},
34 33 {<<"meck">>,{pkg,<<"meck">>,<<"0.8.13">>},1},
35 34 {<<"mimetypes">>,{pkg,<<"mimetypes">>,<<"1.1.0">>},1},
36 35 {<<"mochiweb">>,{pkg,<<"mochiweb">>,<<"2.22.0">>},1},
37 36 {<<"mqtt_packet_map">>,{pkg,<<"mqtt_packet_map">>,<<"1.1.0">>},2},
38 - {<<"mqtt_sessions">>,{pkg,<<"mqtt_sessions">>,<<"1.4.1">>},1},
37 + {<<"mqtt_sessions">>,{pkg,<<"mqtt_sessions">>,<<"2.0.0">>},1},
39 38 {<<"oauth">>,{pkg,<<"oauth">>,<<"2.1.0">>},1},
40 39 {<<"parse_trans">>,{pkg,<<"parse_trans">>,<<"3.4.0">>},1},
41 40 {<<"poolboy">>,{pkg,<<"poolboy">>,<<"1.5.2">>},1},
  @@ -50,22 +49,22 @@
50 49 {<<"setup">>,{pkg,<<"setup">>,<<"2.1.0">>},1},
51 50 {<<"sidejob">>,{pkg,<<"sidejob">>,<<"2.1.0">>},1},
52 51 {<<"ssl_verify_fun">>,{pkg,<<"ssl_verify_fun">>,<<"1.1.6">>},2},
53 - {<<"template_compiler">>,{pkg,<<"template_compiler">>,<<"1.6.0">>},1},
52 + {<<"template_compiler">>,{pkg,<<"template_compiler">>,<<"2.1.1">>},1},
54 53 {<<"tls_certificate_check">>,
55 54 {pkg,<<"tls_certificate_check">>,<<"1.11.0">>},
56 55 1},
57 56 {<<"yamerl">>,{pkg,<<"yamerl">>,<<"0.8.1">>},1},
58 - {<<"zotonic_core">>,{pkg,<<"zotonic_core">>,<<"1.0.0-rc.0">>},0},
57 + {<<"zotonic_core">>,{pkg,<<"zotonic_core">>,<<"1.0.0-rc.1">>},0},
59 58 {<<"zotonic_filehandler">>,
60 - {pkg,<<"zotonic_filehandler">>,<<"1.0.0-rc.0">>},
59 + {pkg,<<"zotonic_filehandler">>,<<"1.0.0-rc.1">>},
61 60 1},
62 61 {<<"zotonic_fileindexer">>,
63 - {pkg,<<"zotonic_fileindexer">>,<<"1.0.0-rc.0">>},
62 + {pkg,<<"zotonic_fileindexer">>,<<"1.0.0-rc.1">>},
64 63 1},
65 64 {<<"zotonic_filewatcher">>,
66 - {pkg,<<"zotonic_filewatcher">>,<<"1.0.0-rc.0">>},
65 + {pkg,<<"zotonic_filewatcher">>,<<"1.0.0-rc.1">>},
67 66 1},
68 - {<<"zotonic_notifier">>,{pkg,<<"zotonic_notifier">>,<<"1.0.0-rc.0">>},1},
67 + {<<"zotonic_notifier">>,{pkg,<<"zotonic_notifier">>,<<"1.0.0-rc.1">>},1},
69 68 {<<"zotonic_rdf">>,{pkg,<<"zotonic_rdf">>,<<"1.0.1">>},1},
70 69 {<<"zotonic_ssl">>,{pkg,<<"zotonic_ssl">>,<<"1.1.0">>},1},
71 70 {<<"zotonic_stdlib">>,{pkg,<<"zotonic_stdlib">>,<<"1.6.0">>},1}]}.
  @@ -74,11 +73,11 @@
74 73 {<<"bcrypt">>, <<"A6763BD4E1AF46D34776F85B7995E63A02978DE110C077E9570ED17006E03386">>},
75 74 {<<"bear">>, <<"16264309AE5D005D03718A5C82641FCC259C9E8F09ADEB6FD79CA4271168656F">>},
76 75 {<<"bert">>, <<"A87D6693515070A9B287C1043CB7E5B2406BE0357685022764BFBD2609703555">>},
77 - {<<"buffalo">>, <<"00D5702C862CF365D71556D0134D6CD5F488AA324DECD06927E7A0AC58352935">>},
76 + {<<"buffalo">>, <<"F4BEDBB1BFA22004BB949C4579FDCD0DCC8E2C7A44D94CC380B494D48365789B">>},
78 77 {<<"cf">>, <<"5CB902239476E141EA70A740340233782D363A31EEA8AD37049561542E6CD641">>},
79 78 {<<"cowboy">>, <<"865DD8B6607E14CF03282E10E934023A1BD8BE6F6BACF921A7E2A96D800CD452">>},
80 79 {<<"cowlib">>, <<"0B9FF9C346629256C42EBE1EEB769A83C6CB771A6EE5960BD110AB0B9B872063">>},
81 - {<<"cowmachine">>, <<"0C1DF354E0D1A4A76C8C80A4F21852602E9C29A15EE5098A48D7E08428E4B78D">>},
80 + {<<"cowmachine">>, <<"38F40D72B04D89F05208646439A612B4E40693F23332B31496C7BD737528CC8A">>},
82 81 {<<"depcache">>, <<"BB85FDD459FAF1374773EDA4249D2C1F037A32C509AC1E1C89654CAB3D4CC233">>},
83 82 {<<"dh_date">>, <<"5B0C286665E160DE44132552931BEF06B5CB2244D5BD20E333A686E9D8BF92E3">>},
84 83 {<<"diffy">>, <<"7060E34FD512F210056B7E66E8D315CB90D06B97A6656D92FC299EB91692E36E">>},
  @@ -92,22 +91,21 @@
92 91 {<<"erlpass">>, <<"395BAAF1E296B7B46C9D296C25040AF1B7EB91731F208D772BA346AB4572A8FC">>},
93 92 {<<"erlware_commons">>, <<"918C56D8FB3BE52AF0DF138ED6E0755E764AD4467CD7D025761F7D0A17D3DEC1">>},
94 93 {<<"exometer_core">>, <<"AB97E34A5D69AB14E6AE161DB4CCA5B5E655E635B842F830EE6AB2CBFCFDC30A">>},
95 - {<<"filezcache">>, <<"DE13CF96E265746ED18ACDC0A008C75E0A7E6CA672E2823C62353C98C1A10281">>},
94 + {<<"filezcache">>, <<"6F59DEB2A507CF39647DEA275DA664F7ACA19AB6B9424828AEC36587CED7B715">>},
96 95 {<<"folsom">>, <<"A885F0AEEE4C84270954C88A55A5A473D6B2C7493E32FFDC5765412DD555A951">>},
97 96 {<<"gen_smtp">>, <<"BF9303C31735100631B1D708D629E4C65944319D1143B5C9952054F4A1311D85">>},
98 - {<<"goldrush">>, <<"F06E5D5F1277DA5C413E84D5A2924174182FB108DABB39D5EC548B27424CD106">>},
99 97 {<<"gproc">>, <<"853CCB7805E9ADA25D227A157BA966F7B34508F386A3E7E21992B1B484230699">>},
100 98 {<<"hut">>, <<"71F2F054E657C03F959CF1ACC43F436EA87580696528CA2A55C8AFB1B06C85E7">>},
101 99 {<<"jobs">>, <<"B2F0071531C4A48575A096FEC428DCDD4555C64E5086FE521FCEAF581B1F51DC">>},
102 100 {<<"jsx">>, <<"20A170ABD4335FC6DB24D5FAD1E5D677C55DADF83D1B20A8A33B5FE159892A39">>},
103 101 {<<"jsxrecord">>, <<"7C029EFCC0C8F48D4FFB9FB1401855051974535228775789A15DBBC360D2060B">>},
104 102 {<<"keyserver">>, <<"09F9841C0721062C455E1FE02070DD4298EC821B9396419F36F0B3B2B3BB5A12">>},
105 - {<<"lager">>, <<"4CAB289120EB24964E3886BD22323CB5FEFE4510C076992A23AD18CF85413D8C">>},
103 + {<<"logstasher">>, <<"201887477C830545493025CE871D276FD923E6193ED5B8D3DE49B448B8B7A03F">>},
106 104 {<<"meck">>, <<"FFEDB39F99B0B99703B8601C6F17C7F76313EE12DE6B646E671E3188401F7866">>},
107 105 {<<"mimetypes">>, <<"82D455AE77558C0B839D7EF8F862FB67AD4450CD394FC728F8D894078F95B40F">>},
108 106 {<<"mochiweb">>, <<"F104D6747C01A330C38613561977E565B788B9170055C5241AC9DD6E4617CBA5">>},
109 107 {<<"mqtt_packet_map">>, <<"4D44C0673B936491F9BE7AF4908092AB902C0ADFD168158DC73953A3A560C547">>},
110 - {<<"mqtt_sessions">>, <<"9F502E34F711DF34D2679F7C59143144B87EFCE74997764CB78F8EAE1FEE62AC">>},
108 + {<<"mqtt_sessions">>, <<"8369F0C6233D65AC8FAFC2B4F34F04FB9EA6823BFB2627125E66C4296C981184">>},
111 109 {<<"oauth">>, <<"D339CD258E3384703CB75D21A7958F0258FD1B7B0022BC59AEA154BE74B817CC">>},
112 110 {<<"parse_trans">>, <<"BB87AC362A03CA674EBB7D9D498F45C03256ADED7214C9101F7035EF44B798C7">>},
113 111 {<<"poolboy">>, <<"392B007A1693A64540CEAD79830443ABF5762F5D30CF50BC95CB2C1AAAFA006B">>},
  @@ -122,14 +120,14 @@
122 120 {<<"setup">>, <<"05F69185A5EB71474C9BC6BA892565651EC7507791F85632B7B914DBFE130510">>},
123 121 {<<"sidejob">>, <<"5D6A7C9C620778CB1908E46B552D767DF2ED4D77070BB7B5B8773D4FF18D1D37">>},
124 122 {<<"ssl_verify_fun">>, <<"CF344F5692C82D2CD7554F5EC8FD961548D4FD09E7D22F5B62482E5AEAEBD4B0">>},
125 - {<<"template_compiler">>, <<"10740EE281C8D802FA8D4278A9D84D6278F135D3215AAD7F51B118FFD783C3A9">>},
123 + {<<"template_compiler">>, <<"DF70959D64AD5B541891D35C2E304E9D16859078183F54B2CE9224ECF1AB7A7E">>},
126 124 {<<"tls_certificate_check">>, <<"609DCD503F31170F0799DAC380EB0E086388CF918FC769AAA60DDD6BBF575218">>},
127 125 {<<"yamerl">>, <<"07DA13FFA1D8E13948943789665C62CCD679DFA7B324A4A2ED3149DF17F453A4">>},
128 - {<<"zotonic_core">>, <<"542523309D63F91367E127F4AC48C8D91F6D741F9EC48EEDB92089F97DEA7E3B">>},
129 - {<<"zotonic_filehandler">>, <<"8FA903344B54A44DF913B9B2BA3C43059D4A820FCE273AD6FEC06C3FC60316A0">>},
130 - {<<"zotonic_fileindexer">>, <<"294470C9881D30D9756ECA01EF572314C220FB2375413397FF881E4B7220B680">>},
131 - {<<"zotonic_filewatcher">>, <<"549A4FD7613EC00E44D5823953CA37E6EF013CC8FB54A9FC7602E2FF3FEBF992">>},
132 - {<<"zotonic_notifier">>, <<"D950538D7D21400AF6EB9F33FE9A6C2073B96E6C60BFEDDF077FEE4E4A806AC4">>},
126 + {<<"zotonic_core">>, <<"8D5FB41B6B38C8CBC07D7E1CAC1502150D1E5DC9BC9154BE651DA9AFE6397AFB">>},
127 + {<<"zotonic_filehandler">>, <<"705E09CBA10CF98E3231BFC2230F31C7813A06250127EBE04E2668A4CDC517F0">>},
128 + {<<"zotonic_fileindexer">>, <<"025A825A2368AC369633D0E3BB39BEA4D24E98013CC387BB2BCBDAA157FC6F0C">>},
129 + {<<"zotonic_filewatcher">>, <<"B21660D738FBC9903B5D678F974E6A960BF8511A877F140FEF5D9483A57A1244">>},
130 + {<<"zotonic_notifier">>, <<"00638E6685EB3EC02AE9E1E79A1C9694914400EB85F80F3D96161F2786CA7FD6">>},
133 131 {<<"zotonic_rdf">>, <<"D0E72A13D179549E6520BFCCFFD25F4C93533098698EE77F73CFE5778345D708">>},
134 132 {<<"zotonic_ssl">>, <<"16A96C8B9597F977EC12B179CB2ED6C635674BB1BA7CEC24C5999191C3C95BDD">>},
135 133 {<<"zotonic_stdlib">>, <<"872E85BD2DC8A49A4DA255E4DF6C1B4DDC993E59024D02303BD6A5DF0868859B">>}]},
  @@ -137,11 +135,11 @@
137 135 {<<"bcrypt">>, <<"3418821BC17CE6E96A4A77D1A88D7485BF783E212069FACFC79510AFBFF95352">>},
138 136 {<<"bear">>, <<"534217DCE6A719D59E54FB0EB7A367900DBFC5F85757E8C1F94269DF383F6D9B">>},
139 137 {<<"bert">>, <<"2A561521EC3529B248658A3E2D3D4BFE6729B0AB8291C701BF15EF413EDA1506">>},
140 - {<<"buffalo">>, <<"50DB4460D5E2BB2DAEBB75B0CF9182F384E520E24B138DABF5B112A99E9D7280">>},
138 + {<<"buffalo">>, <<"97653C8E2958D9032FC4D5F5EAAD65BFAABCE4B82937703F82B04FBD356C25EA">>},
141 139 {<<"cf">>, <<"315E8D447D3A4B02BCDBFA397AD03BBB988A6E0AA6F44D3ADD0F4E3C3BF97672">>},
142 140 {<<"cowboy">>, <<"2C729F934B4E1AA149AFF882F57C6372C15399A20D54F65C8D67BEF583021BDE">>},
143 141 {<<"cowlib">>, <<"2B3E9DA0B21C4565751A6D4901C20D1B4CC25CBB7FD50D91D2AB6DD287BC86A9">>},
144 - {<<"cowmachine">>, <<"D429FCE1D114D415284A96C5E5E76544A86415F18B41D17D271E171004343884">>},
142 + {<<"cowmachine">>, <<"4CD30738036285071DFBA1FC0CAE87DA9FB269925F81BDD25E49E75E7FB8F828">>},
145 143 {<<"depcache">>, <<"40A441A5B1B8E322263C4E6EF35A7D5BC75D080E7A4AAB0D02BCE6059DF53BC1">>},
146 144 {<<"dh_date">>, <<"3F5D908383A0243A693147EA85A5654769B90078AC999A076ED6F0917F7614CF">>},
147 145 {<<"diffy">>, <<"9A59BBDCAFB6B115B5099711F7F114EDB00BE11658CEF08EF26E04F8040C7149">>},
  @@ -155,22 +153,21 @@
155 153 {<<"erlpass">>, <<"0F3B6FF0E854A78E6F356364AA91AE7DA27FA4DDDBA633033B67848B37550D38">>},
156 154 {<<"erlware_commons">>, <<"3E7C6FB2BA4C29B0DD5DFE9D031B66449E2088ECEC1A81465BD9FDE05ED7D0DB">>},
157 155 {<<"exometer_core">>, <<"6AFBD8F6B1AAF7443D6A5A05BBBCD15285622353550F3077C87176E25BE99C1E">>},
158 - {<<"filezcache">>, <<"A712A316990CCB8E2C77AE063F495A6D94E7F3016251395E899D428CBC247601">>},
156 + {<<"filezcache">>, <<"86CD60A0FE537E953F80B62927A98D755D4CD5584D51EEC5DB8628CB712BCD43">>},
159 157 {<<"folsom">>, <<"F7B644FC002A75AF00B8BFBD3CC5C2BD955E09A118D2982D9A6C04E5646FF367">>},
160 158 {<<"gen_smtp">>, <<"51BC50CC017EFD4A4248CBC39EA30FB60EFA7D4A49688986FAFAD84434FF9AB7">>},
161 - {<<"goldrush">>, <<"99CB4128CFFCB3227581E5D4D803D5413FA643F4EB96523F77D9E6937D994CEB">>},
162 159 {<<"gproc">>, <<"587E8AF698CCD3504CF4BA8D90F893EDE2B0F58CABB8A916E2BF9321DE3CF10B">>},
163 160 {<<"hut">>, <<"7E15D28555D8A1F2B5A3A931EC120AF0753E4853A4C66053DB354F35BF9AB563">>},
164 161 {<<"jobs">>, <<"4E50CC8EDD7B5A0AE6F4C17B25514470A772626A5F6C24E9BC06A62AEF618237">>},
165 162 {<<"jsx">>, <<"37BECA0435F5CA8A2F45F76A46211E76418FBEF80C36F0361C249FC75059DC6D">>},
166 163 {<<"jsxrecord">>, <<"04A7E108F7FADC7F88FAB4CBCDFF34B5A1BFD4073A431ADDA288B1AE27DC0FA5">>},
167 164 {<<"keyserver">>, <<"40BE055BC455093E3A4D604219C2F293B416604A7D8E3776E761D549D1311192">>},
168 - {<<"lager">>, <<"7F904D9E87A8CB7E66156ED31768D1C8E26EBA1D54F4BC85B1AA4AC1F6340C28">>},
165 + {<<"logstasher">>, <<"25B6307B6F4A6B0CE523BAFF1E680811562007348A6B6EA1B2206DE9F0EAC575">>},
169 166 {<<"meck">>, <<"D34F013C156DB51AD57CC556891B9720E6A1C1DF5FE2E15AF999C84D6CEBEB1A">>},
170 167 {<<"mimetypes">>, <<"234802943A215B1B6CE408015F103C4223EA98179E4FE411CD55E9A4D0B07E53">>},
171 168 {<<"mochiweb">>, <<"CBBD1FD315D283C576D1C8A13E0738F6DAFB63DC840611249608697502A07655">>},
172 169 {<<"mqtt_packet_map">>, <<"82BD12177EC927244ECC40093FB5A9BFAC317106168FD11F7D49FB3434C6D1DA">>},
173 - {<<"mqtt_sessions">>, <<"3DB3B9DF5CF48E78AD268B8C04EEF37CAE6574940AFBEAC39E0187C530C9E263">>},
170 + {<<"mqtt_sessions">>, <<"9CD85CF8FCF6571A6783577F16FF83D1829888230E4735B3EE3FC980FF94A1A7">>},
174 171 {<<"oauth">>, <<"1E88788690B3CDE182F77829F205EAB75522255DCCED20341C5BA05CAC849B13">>},
175 172 {<<"parse_trans">>, <<"F99E368830BEA44552224E37E04943A54874F08B8590485DE8D13832B63A2DC3">>},
176 173 {<<"poolboy">>, <<"DAD79704CE5440F3D5A3681C8590B9DC25D1A561E8F5A9C995281012860901E3">>},
  @@ -185,14 +182,14 @@
185 182 {<<"setup">>, <<"EFD072578F0CF85BEA96CAAFFC7ADB0992398272522660A136E10567377071C5">>},
186 183 {<<"sidejob">>, <<"6DC3DAC041C8C07C64401ECD22684730DA1497F5F14377B3CA9C5B2B9A135181">>},
187 184 {<<"ssl_verify_fun">>, <<"BDB0D2471F453C88FF3908E7686F86F9BE327D065CC1EC16FA4540197EA04680">>},
188 - {<<"template_compiler">>, <<"72ED887699535BD1FADC153CBFD75D404738DDB4226629B4FC5F237341EB00BB">>},
185 + {<<"template_compiler">>, <<"7FFBA8312987BFB118248B7542EFFC15999DA06F3D48E7D7F211CA8D85FF71C8">>},
189 186 {<<"tls_certificate_check">>, <<"4AB962212EF7C87482619CB298E1FE06E047B57F0BD58CC417B3B299EB8D036E">>},
190 187 {<<"yamerl">>, <<"96CB30F9D64344FED0EF8A92E9F16F207DE6C04DFFF4F366752CA79F5BCEB23F">>},
191 - {<<"zotonic_core">>, <<"BE0A04D500BFAC9632E8E033E12F97AF7605F50DF799AA1F694A114D8245848B">>},
192 - {<<"zotonic_filehandler">>, <<"3AF98681F602BACA1980355D7E800C96EAEC40A28961115165C0B82354C4125A">>},
193 - {<<"zotonic_fileindexer">>, <<"50A214DC04C1CCEB6F9E885C5B318E8CBC3DE22316DE8A8BCC83943217C7CAEB">>},
194 - {<<"zotonic_filewatcher">>, <<"B0BE9C9AD9D49526490206D9BC29392E9488D4897C536C3EB528B80000B05DCB">>},
195 - {<<"zotonic_notifier">>, <<"B47987E0740061F0F9296302293A095A990B2BDFC27EDFDBBDAB0DB55EB22172">>},
188 + {<<"zotonic_core">>, <<"43EB3734A4169B34F2976B80BAF6D01BE7215791EB1F1B5F2EFC762E74674ADE">>},
189 + {<<"zotonic_filehandler">>, <<"9677AF0F80D6E1CDC6A641C280DCC87C6516ACDC813E694495422136524989B2">>},
190 + {<<"zotonic_fileindexer">>, <<"D807B097A5B2415F0C818314D5F2271FF1D0D79AB023C90AD4FC1EA7B2B88CD7">>},
191 + {<<"zotonic_filewatcher">>, <<"396D81D8B634473414BD775DE37A937B4220FB808A1E052A9D8A963C6903E4E1">>},
192 + {<<"zotonic_notifier">>, <<"657F891004C2C518B96C4373EE00711E50955D8AA80E8322B719F5840971138E">>},
196 193 {<<"zotonic_rdf">>, <<"096C1E2E16582FE3F6253534068D22B39F246D84C01237C42A8B489B42BB7A16">>},
197 194 {<<"zotonic_ssl">>, <<"FC8193CFA273956C2669F448102DD7A4F0E4AA8E3C81FA7EB46114911146CF4C">>},
198 195 {<<"zotonic_stdlib">>, <<"9139167866615F226C3915B6082B317892E276F3A9C78C5A99CD497FA589444E">>}]}
  @@ -1,8 +1,8 @@
1 1 {application,zotonic_listen_smtp,
2 2 [{description,"Zotonic SMTP Listener"},
3 - {vsn,"1.0.0-rc.0"},
3 + {vsn,"1.0.0-rc.1"},
4 4 {registered,[]},
5 - {applications,[kernel,stdlib,lager,gen_smtp,zotonic_core]},
5 + {applications,[kernel,stdlib,gen_smtp,zotonic_core]},
6 6 {env,[]},
7 7 {modules,[zotonic_listen_smtp]},
8 8 {doc,"doc"},
  @@ -24,8 +24,6 @@
24 24
25 25 -behaviour(gen_smtp_server_session).
26 26
27 - -compile([{parse_transform, lager_transform}]).
28 -
29 27 -include_lib("zotonic_core/include/zotonic.hrl").
30 28
31 29 -export([ child_spec/0 ]).
  @@ -48,10 +46,10 @@
48 46 child_spec() ->
49 47 case {z_config:get(smtp_listen_ip),z_config:get(smtp_listen_port)} of
50 48 {none, _} ->
51 - lager:warning("SMTP server disabled: 'smtp_listen_ip' is set to 'none'"),
49 + ?LOG_WARNING("SMTP server disabled: 'smtp_listen_ip' is set to 'none'"),
52 50 ignore;
53 51 {_, none} ->
54 - lager:warning("SMTP server disabled: 'smtp_listen_port' is set to 'none'"),
52 + ?LOG_WARNING("SMTP server disabled: 'smtp_listen_port' is set to 'none'"),
55 53 ignore;
56 54 {IP, Port} ->
57 55 Args1 = case z_config:get(smtp_listen_domain) of
  @@ -65,8 +63,8 @@ child_spec() ->
65 63 [{address, IP} | Args1]
66 64 end,
67 65 case IP of
68 - any -> lager:info("SMTP server listening on any:~p", [Port]);
69 - _ -> lager:info("SMTP server listening on ~s:~p", [inet:ntoa(IP), Port])
66 + any -> ?LOG_NOTICE("SMTP server listening on any:~p", [Port]);
67 + _ -> ?LOG_NOTICE("SMTP server listening on ~s:~p", [inet:ntoa(IP), Port])
70 68 end,
71 69 Options = [{port, Port} | Args2],
72 70 gen_smtp_server:child_spec(?MODULE, ?MODULE, Options)
  @@ -86,7 +84,7 @@ init(Hostname, SessionCount, PeerName, Options) ->
86 84 },
87 85 {ok, State#state.banner, State};
88 86 true ->
89 - lager:warning("SMTP Connection limit exceeded (~p)", [SessionCount]),
87 + ?LOG_WARNING("SMTP Connection limit exceeded (~p)", [SessionCount]),
90 88 {stop, normal, io_lib:format("421 ~s is too busy to accept mail right now", [Hostname])}
91 89 end.
92 90
  @@ -123,7 +121,7 @@ check_dnsbl(State) ->
123 121 {ok, allowed} ->
124 122 {ok, State};
125 123 {ok, {blocked, Service}} ->
126 - lager:info("SMTP DNSBL check for ~s blocked by ~p -- closing connection with a 451",
124 + ?LOG_NOTICE("SMTP DNSBL check for ~s blocked by ~p -- closing connection with a 451",
127 125 [inet:ntoa(State#state.peer), Service]),
128 126 Error = io_lib:format("451 ~s has recently sent spam. If you are not a spammer, please try later. Listed at ~s",
129 127 [inet:ntoa(State#state.peer), Service]),
  @@ -144,16 +142,16 @@ handle_RCPT(To, State) ->
144 142 % - Return-Path header should be present and contains <>
145 143 case zotonic_listen_smtp_receive:get_site(To) of
146 144 {ok, _} ->
147 - lager:info("SMTP accepting incoming email for ~p", [To]),
145 + ?LOG_NOTICE("SMTP accepting incoming email for ~p", [To]),
148 146 {ok, State};
149 147 {error, unknown_host} ->
150 - lager:warning("SMTP not accepting mail for ~p: unknown host", [To]),
148 + ?LOG_WARNING("SMTP not accepting mail for ~p: unknown host", [To]),
151 149 {error, "551 User not local. Relay denied.", State};
152 150 {error, not_running} ->
153 - lager:warning("SMTP not accepting mail for ~p: site not running", [To]),
151 + ?LOG_WARNING("SMTP not accepting mail for ~p: site not running", [To]),
154 152 {error, "453 System not accepting network messages.", State}
155 153 % {error, Reason} ->
156 - % lager:info("SMTP not accepting mail for ~p: ~p", [Reason]),
154 + % ?LOG_INFO("SMTP not accepting mail for ~p: ~p", [Reason]),
157 155 % {error, "451 Server error. Please try again later.", State}
158 156 end.
159 157
  @@ -202,7 +200,7 @@ decode_and_receive(MsgId, From, To, DataRcvd, State) ->
202 200 {ok, {Type, Subtype, Headers, _Params, Body} = Decoded} ->
203 201 case find_bounce_id({Type, Subtype}, To, Headers) of
204 202 {ok, MessageId} ->
205 - lager:info("SMTP email to ~p is bounce of message id ~p",
203 + ?LOG_NOTICE("SMTP email to ~p is bounce of message id ~p",
206 204 [ To, MessageId ]),
207 205 % The e-mail server knows about the messages sent from our system.
208 206 % Only report fatal bounces, silently ignore delivery warnings
  @@ -213,12 +211,12 @@ decode_and_receive(MsgId, From, To, DataRcvd, State) ->
213 211 {ok, MsgId, reset_state(State)};
214 212 bounce ->
215 213 % Bounced, but without a message id (accept & silently drop the message)
216 - lager:info("SMTP email to ~p is bounce of unknown message id",
214 + ?LOG_NOTICE("SMTP email to ~p is bounce of unknown message id",
217 215 [ To ]),
218 216 {ok, MsgId, reset_state(State)};
219 217 maybe_autoreply ->
220 218 % Sent to a bounce address, but not a bounce (accept & silently drop the message)
221 - lager:info("SMTP email to ~p is an autoreply, ignored",
219 + ?LOG_NOTICE("SMTP email to ~p is an autoreply, ignored",
222 220 [ To ]),
223 221 {ok, MsgId, reset_state(State)};
224 222 no_bounce ->
  @@ -226,22 +224,22 @@ decode_and_receive(MsgId, From, To, DataRcvd, State) ->
226 224 Decoded, MsgId, From, To, DataRcvd, State)
227 225 end;
228 226 {error, Reason} ->
229 - lager:error("SMTP receive: Message decode FAILED with ~p", [Reason]),
227 + ?LOG_ERROR("SMTP receive: Message decode FAILED with ~p", [Reason]),
230 228 {error, "550 Your email cannot be parsed", State}
231 229 end.
232 230
233 231 receive_data({ok, {ham, SpamStatus, _SpamHeaders}}, {Type, Subtype, Headers, Params, Body}, MsgId, From, To, DataRcvd, State) ->
234 - lager:info("SMTP email from ~s to ~p (id ~s) (peer ~s) [~p]",
232 + ?LOG_NOTICE("SMTP email from ~s to ~p (id ~s) (peer ~s) [~p]",
235 233 [From, To, MsgId, inet_parse:ntoa(State#state.peer), SpamStatus]),
236 234 Received = zotonic_listen_smtp_receive:received(To, From, State#state.peer, MsgId,
237 235 {Type, Subtype}, Headers, Params, Body, DataRcvd),
238 236 reply_handled_status(Received, MsgId, reset_state(State));
239 237 receive_data({ok, {spam, SpamStatus, _SpamHeaders}}, _Decoded, MsgId, From, To, _DataRcvd, State) ->
240 - lager:info("Refusing spam from ~s to ~p (id ~s) (peer ~s) [~p]",
238 + ?LOG_NOTICE("Refusing spam from ~s to ~p (id ~s) (peer ~s) [~p]",
241 239 [From, To, MsgId, inet_parse:ntoa(State#state.peer), SpamStatus]),
242 240 {error, zotonic_listen_smtp_spam:smtp_status(SpamStatus, From, To, State#state.peer), reset_state(State)};
243 241 receive_data({error, Reason}, Decoded, MsgId, From, To, DataRcvd, State) ->
244 - lager:info("SMTP receive: passing erronous spam check (~p) as ham for msg-id ~p", [Reason, MsgId]),
242 + ?LOG_NOTICE("SMTP receive: passing erronous spam check (~p) as ham for msg-id ~p", [Reason, MsgId]),
245 243 receive_data({ok, {ham, [], []}}, Decoded, MsgId, From, To, DataRcvd, State).
246 244
247 245 reply_handled_status(Received, MsgId, State) ->
Loading more files…