ruote 0.9.18 → 0.9.19

Sign up to get free protection for your applications and to get access to all the features.
Files changed (323) hide show
  1. data/README.txt +2 -0
  2. data/examples/about_state.rb +29 -29
  3. data/examples/bigflow.rb +9 -9
  4. data/examples/csv_weather.rb +4 -4
  5. data/examples/engine_template.rb +141 -129
  6. data/examples/flowtracing.rb +8 -8
  7. data/examples/homeworkreview.rb +15 -15
  8. data/examples/kotoba.rb +9 -9
  9. data/examples/mano_tracker.rb +63 -63
  10. data/examples/openwferu.rb +22 -20
  11. data/examples/quotereporter.rb +79 -79
  12. data/lib/openwfe/contextual.rb +72 -72
  13. data/lib/openwfe/def.rb +21 -21
  14. data/lib/openwfe/engine.rb +19 -19
  15. data/lib/openwfe/engine/engine.rb +578 -614
  16. data/lib/openwfe/engine/expool_methods.rb +144 -115
  17. data/lib/openwfe/engine/file_persisted_engine.rb +77 -77
  18. data/lib/openwfe/engine/participant_methods.rb +96 -96
  19. data/lib/openwfe/engine/status_methods.rb +271 -247
  20. data/lib/openwfe/engine/update_exp_methods.rb +69 -69
  21. data/lib/openwfe/exceptions.rb +25 -25
  22. data/lib/openwfe/expool/errorjournal.rb +334 -348
  23. data/lib/openwfe/expool/expool_pause_methods.rb +98 -0
  24. data/lib/openwfe/expool/expressionpool.rb +793 -800
  25. data/lib/openwfe/expool/expstorage.rb +284 -313
  26. data/lib/openwfe/expool/history.rb +193 -105
  27. data/lib/openwfe/expool/journal.rb +163 -163
  28. data/lib/openwfe/expool/journal_replay.rb +228 -228
  29. data/lib/openwfe/expool/parser.rb +178 -142
  30. data/lib/openwfe/{orest/exception.rb → expool/paused_error.rb} +49 -32
  31. data/lib/openwfe/expool/representation.rb +59 -59
  32. data/lib/openwfe/expool/threadedexpstorage.rb +137 -134
  33. data/lib/openwfe/expool/wfidgen.rb +289 -287
  34. data/lib/openwfe/expool/yamlexpstorage.rb +154 -154
  35. data/lib/openwfe/expressions/condition.rb +175 -168
  36. data/lib/openwfe/expressions/environment.rb +165 -165
  37. data/lib/openwfe/expressions/expressionmap.rb +135 -131
  38. data/lib/openwfe/expressions/fe_cancel.rb +68 -68
  39. data/lib/openwfe/expressions/fe_command.rb +190 -190
  40. data/lib/openwfe/expressions/fe_concurrence.rb +531 -531
  41. data/lib/openwfe/expressions/fe_cron.rb +152 -197
  42. data/lib/openwfe/expressions/fe_cursor.rb +152 -186
  43. data/lib/openwfe/expressions/fe_define.rb +118 -118
  44. data/lib/openwfe/expressions/fe_do.rb +109 -109
  45. data/lib/openwfe/expressions/fe_equals.rb +219 -219
  46. data/lib/openwfe/expressions/fe_filter.rb +98 -98
  47. data/lib/openwfe/expressions/fe_filter_definition.rb +122 -122
  48. data/lib/openwfe/expressions/fe_fqv.rb +203 -203
  49. data/lib/openwfe/expressions/fe_http.rb +212 -0
  50. data/lib/openwfe/expressions/fe_if.rb +214 -214
  51. data/lib/openwfe/expressions/fe_iterator.rb +91 -91
  52. data/lib/openwfe/expressions/fe_listen.rb +268 -268
  53. data/lib/openwfe/expressions/fe_losfor.rb +73 -73
  54. data/lib/openwfe/expressions/fe_misc.rb +343 -351
  55. data/lib/openwfe/expressions/fe_participant.rb +206 -206
  56. data/lib/openwfe/expressions/fe_reserve.rb +153 -142
  57. data/lib/openwfe/expressions/fe_save.rb +226 -226
  58. data/lib/openwfe/expressions/fe_sequence.rb +66 -56
  59. data/lib/openwfe/expressions/fe_set.rb +80 -80
  60. data/lib/openwfe/expressions/fe_sleep.rb +132 -125
  61. data/lib/openwfe/expressions/fe_step.rb +113 -111
  62. data/lib/openwfe/expressions/fe_subprocess.rb +139 -136
  63. data/lib/openwfe/expressions/fe_timeout.rb +74 -78
  64. data/lib/openwfe/expressions/fe_wait.rb +48 -49
  65. data/lib/openwfe/expressions/fe_when.rb +106 -106
  66. data/lib/openwfe/expressions/filter.rb +60 -60
  67. data/lib/openwfe/expressions/flowexpression.rb +618 -612
  68. data/lib/openwfe/expressions/iterator.rb +158 -158
  69. data/lib/openwfe/expressions/merge.rb +53 -53
  70. data/lib/openwfe/expressions/raw.rb +396 -397
  71. data/lib/openwfe/expressions/rprocdef.rb +261 -266
  72. data/lib/openwfe/expressions/time.rb +238 -243
  73. data/lib/openwfe/expressions/timeout.rb +135 -135
  74. data/lib/openwfe/expressions/value.rb +55 -55
  75. data/lib/openwfe/extras/engine/db_persisted_engine.rb +94 -0
  76. data/lib/openwfe/extras/expool/dberrorjournal.rb +189 -0
  77. data/lib/openwfe/extras/expool/dbexpstorage.rb +355 -0
  78. data/lib/openwfe/extras/expool/dbhistory.rb +135 -0
  79. data/lib/openwfe/extras/listeners/sqslisteners.rb +146 -0
  80. data/lib/openwfe/extras/misc/activityfeed.rb +264 -0
  81. data/lib/openwfe/extras/misc/basecamp.rb +485 -0
  82. data/lib/openwfe/extras/participants/activeparticipants.rb +749 -0
  83. data/lib/openwfe/extras/participants/atomfeed_participants.rb +173 -0
  84. data/lib/openwfe/extras/participants/atompub_participants.rb +267 -0
  85. data/lib/openwfe/extras/participants/basecamp_participants.rb +87 -0
  86. data/lib/openwfe/extras/participants/csvparticipants.rb +127 -0
  87. data/lib/openwfe/extras/participants/sqsparticipants.rb +125 -0
  88. data/lib/openwfe/extras/participants/twitterparticipants.rb +176 -0
  89. data/lib/openwfe/filterdef.rb +191 -191
  90. data/lib/openwfe/flowexpressionid.rb +271 -269
  91. data/lib/openwfe/listeners/listener.rb +61 -61
  92. data/lib/openwfe/listeners/listeners.rb +81 -81
  93. data/lib/openwfe/listeners/socketlisteners.rb +189 -189
  94. data/lib/openwfe/logging.rb +74 -74
  95. data/lib/openwfe/omixins.rb +55 -54
  96. data/lib/openwfe/orest/definitions.rb +90 -90
  97. data/lib/openwfe/orest/osocket.rb +91 -91
  98. data/lib/openwfe/orest/xmlcodec.rb +471 -459
  99. data/lib/openwfe/participants.rb +19 -19
  100. data/lib/openwfe/participants/enoparticipants.rb +187 -187
  101. data/lib/openwfe/participants/participant.rb +100 -100
  102. data/lib/openwfe/participants/participantmap.rb +170 -170
  103. data/lib/openwfe/participants/participants.rb +316 -316
  104. data/lib/openwfe/participants/soapparticipants.rb +90 -90
  105. data/lib/openwfe/participants/socketparticipants.rb +143 -143
  106. data/lib/openwfe/participants/storeparticipants.rb +198 -198
  107. data/lib/openwfe/rexml.rb +44 -0
  108. data/lib/openwfe/rudefinitions.rb +87 -91
  109. data/lib/openwfe/service.rb +65 -65
  110. data/lib/openwfe/storage/yamlcustom.rb +71 -71
  111. data/lib/openwfe/storage/yamlfilestorage.rb +190 -190
  112. data/lib/openwfe/tools/flowtracer.rb +41 -45
  113. data/lib/openwfe/util/dollar.rb +125 -139
  114. data/lib/openwfe/util/irb.rb +42 -42
  115. data/lib/openwfe/util/observable.rb +93 -99
  116. data/lib/openwfe/util/ometa.rb +36 -36
  117. data/lib/openwfe/util/treechecker.rb +122 -0
  118. data/lib/openwfe/util/workqueue.rb +73 -73
  119. data/lib/openwfe/util/xml.rb +285 -279
  120. data/lib/openwfe/utils.rb +415 -442
  121. data/lib/openwfe/version.rb +1 -1
  122. data/lib/openwfe/workitem.rb +444 -437
  123. data/lib/openwfe/worklist/oldrest.rb +161 -161
  124. data/lib/openwfe/worklist/storelocks.rb +218 -218
  125. data/lib/openwfe/worklist/storeparticipant.rb +19 -19
  126. data/lib/openwfe/worklist/worklist.rb +223 -223
  127. data/test/back_0916_test.rb +57 -59
  128. data/test/bm/bm_1_xml_vs_prog.rb +25 -22
  129. data/test/bm/bm_2_step.rb +81 -81
  130. data/test/bm/ft_0f_5ms.rb +13 -13
  131. data/test/bm/ft_26_load.rb +177 -179
  132. data/test/bm/ft_26b_load.rb +57 -59
  133. data/test/bm/ft_26c_load.rb +70 -65
  134. data/test/bm/ft_recu.rb +51 -51
  135. data/test/clone_test.rb +145 -99
  136. data/test/concurrence_test.rb +41 -41
  137. data/test/condition_test.rb +104 -90
  138. data/test/description_test.rb +46 -45
  139. data/test/eno_test.rb +36 -36
  140. data/test/expmap_test.rb +26 -26
  141. data/test/extras/README.txt +5 -0
  142. data/test/extras/active_connection.rb +48 -0
  143. data/test/extras/active_with_engine_test.rb +140 -0
  144. data/test/extras/activityfeed_test.rb +85 -0
  145. data/test/extras/ap_0_test.rb +287 -0
  146. data/test/extras/ap_1_test.rb +53 -0
  147. data/test/extras/ap_test_base.rb +24 -0
  148. data/test/extras/atomfeedp_test.rb +113 -0
  149. data/test/extras/atompubp_test.rb +91 -0
  150. data/test/extras/basecamp_test.rb +53 -0
  151. data/test/extras/db_errorjournal_utest.rb +75 -0
  152. data/test/extras/db_expstorage_utest.rb +171 -0
  153. data/test/extras/db_history_0_test.rb +58 -0
  154. data/test/extras/ft_19_csv.rb +58 -0
  155. data/test/extras/ft_71_b14008.rb +85 -0
  156. data/test/extras/sqs_test.rb +57 -0
  157. data/test/extras/twitter_test.rb +62 -0
  158. data/test/fe_lookup_att_test.rb +41 -41
  159. data/test/fei_test.rb +131 -131
  160. data/test/file_persisted_engine_test.rb +30 -30
  161. data/test/file_persistence_test.rb +112 -111
  162. data/test/filep_cancel_test.rb +58 -58
  163. data/test/filter_test.rb +67 -67
  164. data/test/flowtestbase.rb +207 -219
  165. data/test/ft_0.rb +35 -35
  166. data/test/ft_0b_sequence.rb +15 -15
  167. data/test/ft_0c_testname.rb +12 -12
  168. data/test/ft_0d_participant.rb +9 -9
  169. data/test/ft_0e_multibody.rb +11 -11
  170. data/test/ft_10_loop.rb +103 -104
  171. data/test/ft_11_ppd.rb +285 -289
  172. data/test/ft_11b_ppd.rb +26 -26
  173. data/test/ft_12_blockparticipant.rb +57 -57
  174. data/test/ft_13_eno.rb +31 -31
  175. data/test/ft_14_subprocess.rb +45 -45
  176. data/test/ft_14b_subprocess.rb +107 -107
  177. data/test/ft_14c_subprocess.rb +33 -33
  178. data/test/ft_15_iterator.rb +127 -127
  179. data/test/ft_15b_iterator.rb +41 -41
  180. data/test/ft_16_fqv.rb +44 -44
  181. data/test/ft_17_condition.rb +48 -48
  182. data/test/ft_18_pname.rb +26 -26
  183. data/test/ft_1_unset.rb +140 -140
  184. data/test/ft_1b_unset.rb +17 -17
  185. data/test/ft_20_cron.rb +33 -33
  186. data/test/ft_21_cron.rb +51 -51
  187. data/test/ft_21b_cron_pause.rb +41 -41
  188. data/test/ft_22_history.rb +45 -41
  189. data/test/ft_23_when.rb +51 -51
  190. data/test/ft_23b_when.rb +43 -43
  191. data/test/ft_23c_wait.rb +48 -48
  192. data/test/ft_23d_cww.rb +28 -28
  193. data/test/ft_24_def.rb +15 -15
  194. data/test/ft_25_cancel.rb +57 -54
  195. data/test/ft_27_getflowpos.rb +79 -83
  196. data/test/ft_28_fileparticipant.rb +25 -25
  197. data/test/ft_29_httprb.rb +57 -57
  198. data/test/ft_2_concurrence.rb +99 -97
  199. data/test/ft_2b_concurrence.rb +132 -132
  200. data/test/ft_2c_concurrence.rb +37 -37
  201. data/test/ft_30_socketlistener.rb +133 -133
  202. data/test/ft_31_flowname.rb +15 -16
  203. data/test/ft_32_journal.rb +48 -48
  204. data/test/ft_32c_journal.rb +54 -54
  205. data/test/ft_32d_journal.rb +43 -46
  206. data/test/ft_33_description.rb +62 -62
  207. data/test/ft_34_cancelwfid.rb +37 -37
  208. data/test/ft_35_localdefs.rb +36 -34
  209. data/test/ft_36_subprocids.rb +61 -61
  210. data/test/ft_37_pnames.rb +33 -33
  211. data/test/ft_38_tag.rb +82 -82
  212. data/test/ft_38b_tag.rb +97 -97
  213. data/test/ft_38c_tag.rb +50 -50
  214. data/test/ft_38d_tag.rb +53 -0
  215. data/test/ft_39_reserve.rb +33 -33
  216. data/test/ft_39b_reserve.rb +59 -59
  217. data/test/ft_3_equals.rb +131 -131
  218. data/test/ft_3b_lookup_vf.rb +43 -43
  219. data/test/ft_40_defined.rb +33 -33
  220. data/test/ft_41_case.rb +80 -80
  221. data/test/ft_42_environments.rb +48 -48
  222. data/test/ft_43_pat10.rb +51 -51
  223. data/test/ft_44_save.rb +37 -37
  224. data/test/ft_44b_restore.rb +151 -151
  225. data/test/ft_45_citerator.rb +149 -149
  226. data/test/ft_45b_citerator.rb +77 -0
  227. data/test/ft_46_pparams.rb +27 -27
  228. data/test/ft_47_filter.rb +100 -100
  229. data/test/ft_48_fe_filter.rb +41 -41
  230. data/test/ft_49_condition.rb +101 -94
  231. data/test/ft_4_misc.rb +185 -190
  232. data/test/ft_50_xml_attribute.rb +101 -104
  233. data/test/ft_51_stack.rb +30 -30
  234. data/test/ft_52_obs_participant.rb +73 -73
  235. data/test/ft_53_null_noop_participant.rb +31 -31
  236. data/test/ft_54_listen.rb +183 -183
  237. data/test/ft_54b_listen.rb +32 -32
  238. data/test/ft_54c_listen.rb +60 -60
  239. data/test/ft_55_ptimeout.rb +29 -30
  240. data/test/ft_56_timeout.rb +29 -29
  241. data/test/ft_57_a.rb +105 -102
  242. data/test/ft_58_ejournal.rb +83 -80
  243. data/test/ft_58b_ejournal.rb +82 -0
  244. data/test/ft_59_ps.rb +148 -86
  245. data/test/ft_5_time.rb +77 -77
  246. data/test/ft_60_ecancel.rb +98 -98
  247. data/test/ft_61_elsub.rb +23 -23
  248. data/test/ft_62_procparticipant.rb +46 -46
  249. data/test/ft_63_pause.rb +82 -69
  250. data/test/ft_64_alias.rb +56 -57
  251. data/test/ft_65_stringlaunch.rb +29 -29
  252. data/test/ft_66_subforget.rb +42 -42
  253. data/test/ft_67_schedlaunch.rb +58 -59
  254. data/test/ft_68_ifparticipant.rb +39 -39
  255. data/test/ft_69_cancelmissing.rb +23 -21
  256. data/test/ft_6_lambda.rb +37 -37
  257. data/test/ft_70_lookupvar.rb +25 -25
  258. data/test/ft_71_log.rb +35 -35
  259. data/test/ft_72_lookup_processes.rb +43 -40
  260. data/test/ft_73_cancel_sub.rb +79 -79
  261. data/test/ft_74_block_and_workitem_dup.rb +42 -42
  262. data/test/ft_75_ruby_attributes.rb +53 -51
  263. data/test/ft_76_merge_isolate.rb +57 -57
  264. data/test/ft_77_segments.rb +13 -13
  265. data/test/ft_78_eval.rb +94 -94
  266. data/test/ft_79_tticket.rb +79 -79
  267. data/test/ft_79b_tticket.rb +73 -73
  268. data/test/ft_79c_outcome.rb +36 -36
  269. data/test/ft_7_lose.rb +73 -73
  270. data/test/ft_7b_lose.rb +49 -49
  271. data/test/ft_80_spname.rb +65 -65
  272. data/test/ft_81_exp.rb +30 -30
  273. data/test/ft_82_trecu.rb +30 -24
  274. data/test/ft_83_badpause.rb +35 -35
  275. data/test/ft_84_updateexp.rb +118 -118
  276. data/test/ft_84b_subrepr.rb +72 -0
  277. data/test/ft_85_dolhash.rb +18 -18
  278. data/test/ft_86_dollar_fv.rb +33 -33
  279. data/test/ft_87_define.rb +47 -47
  280. data/test/ft_88_http.rb +100 -0
  281. data/test/ft_8_forget.rb +25 -25
  282. data/test/ft_9_cursor.rb +119 -110
  283. data/test/ft_9b_cursor.rb +70 -70
  284. data/test/ft_tests.rb +6 -0
  285. data/test/hash_test.rb +52 -34
  286. data/test/hparticipant_test.rb +92 -88
  287. data/test/lookup_att_test.rb +70 -70
  288. data/test/lookup_vf_test.rb +52 -52
  289. data/test/misc_test.rb +55 -51
  290. data/test/obs_test.rb +82 -82
  291. data/test/param_test.rb +181 -181
  292. data/test/participant_test.rb +46 -46
  293. data/test/pending.rb +12 -12
  294. data/test/ps_representation.rb +70 -70
  295. data/test/rake_ltest.rb +2 -2
  296. data/test/rake_qtest.rb +11 -11
  297. data/test/raw_prog_test.rb +303 -308
  298. data/test/restart_cron_test.rb +74 -74
  299. data/test/restart_paused_test.rb +52 -47
  300. data/test/restart_sleep_test.rb +80 -80
  301. data/test/restart_when_test.rb +64 -64
  302. data/test/ruby_procdef_test.rb +71 -71
  303. data/test/rutest_utils.rb +32 -32
  304. data/test/sec_test.rb +143 -142
  305. data/test/slock_test.rb +41 -41
  306. data/test/storage_test.rb +15 -15
  307. data/test/timeout_test.rb +53 -53
  308. data/test/treechecker_test.rb +111 -0
  309. data/test/util_xml_test.rb +57 -57
  310. data/test/wfid_test.rb +93 -93
  311. data/test/wi_test.rb +58 -58
  312. metadata +64 -19
  313. data/examples/scheduler_cron_usage.rb +0 -48
  314. data/examples/scheduler_usage.rb +0 -56
  315. data/lib/openwfe/orest/controlclient.rb +0 -119
  316. data/lib/openwfe/orest/oldrestservlet.rb +0 -279
  317. data/lib/openwfe/orest/restclient.rb +0 -176
  318. data/lib/openwfe/orest/workitem.rb +0 -206
  319. data/lib/openwfe/orest/worklistclient.rb +0 -272
  320. data/test/bm/ft_26d_load.rb +0 -97
  321. data/test/ft_59b_ps_for_pat.rb +0 -58
  322. data/test/ft_64_clone.rb +0 -69
  323. data/test/orest_test.rb +0 -251
@@ -2,31 +2,31 @@
2
2
  #--
3
3
  # Copyright (c) 2007, John Mettraux, OpenWFE.org
4
4
  # All rights reserved.
5
- #
6
- # Redistribution and use in source and binary forms, with or without
5
+ #
6
+ # Redistribution and use in source and binary forms, with or without
7
7
  # modification, are permitted provided that the following conditions are met:
8
- #
8
+ #
9
9
  # . Redistributions of source code must retain the above copyright notice, this
10
- # list of conditions and the following disclaimer.
11
- #
12
- # . Redistributions in binary form must reproduce the above copyright notice,
13
- # this list of conditions and the following disclaimer in the documentation
10
+ # list of conditions and the following disclaimer.
11
+ #
12
+ # . Redistributions in binary form must reproduce the above copyright notice,
13
+ # this list of conditions and the following disclaimer in the documentation
14
14
  # and/or other materials provided with the distribution.
15
- #
15
+ #
16
16
  # . Neither the name of the "OpenWFE" nor the names of its contributors may be
17
17
  # used to endorse or promote products derived from this software without
18
18
  # specific prior written permission.
19
- #
20
- # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21
- # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22
- # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23
- # ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
24
- # LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25
- # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26
- # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27
- # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28
- # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29
- # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
19
+ #
20
+ # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21
+ # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22
+ # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23
+ # ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
24
+ # LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25
+ # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26
+ # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27
+ # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28
+ # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29
+ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30
30
  # POSSIBILITY OF SUCH DAMAGE.
31
31
  #++
32
32
  #
@@ -44,54 +44,54 @@ require 'openwfe/contextual'
44
44
 
45
45
  module OpenWFE
46
46
 
47
- #
48
- # this mixin module provides two protected methods, handle_item() and
49
- # filter_item(). They can be easily overriden to add some special
50
- # behaviours.
51
- #
52
- module WorkItemListener
53
- include Contextual, Logging, OwfeServiceLocator
47
+ #
48
+ # this mixin module provides two protected methods, handle_item() and
49
+ # filter_item(). They can be easily overriden to add some special
50
+ # behaviours.
51
+ #
52
+ module WorkItemListener
53
+ include Contextual, Logging, OwfeServiceLocator
54
54
 
55
- protected
55
+ protected
56
56
 
57
- #
58
- # Simply considers the object as a workitem and feeds it to the
59
- # engine.
60
- #
61
- def handle_item (item)
57
+ #
58
+ # Simply considers the object as a workitem and feeds it to the
59
+ # engine.
60
+ #
61
+ def handle_item (item)
62
62
 
63
- filter_items item
63
+ filter_items item
64
64
 
65
- get_engine.reply item
66
- end
65
+ get_engine.reply item
66
+ end
67
67
 
68
- #
69
- # The base implementation is just empty, feel free to override it
70
- # if you need to filter workitems.
71
- #
72
- # One example :
73
- #
74
- # class MyListener
75
- # include WorkItemListener
76
- #
77
- # protected
78
- #
79
- # #
80
- # # MyListener doesn't accept launchitems
81
- # #
82
- # def filter_items (item)
83
- # raise "launchitems not allowed" \
84
- # if item.is_a?(OpenWFE::LaunchItem)
85
- # end
86
- # end
87
- #
88
- def filter_items (item)
68
+ #
69
+ # The base implementation is just empty, feel free to override it
70
+ # if you need to filter workitems.
71
+ #
72
+ # One example :
73
+ #
74
+ # class MyListener
75
+ # include WorkItemListener
76
+ #
77
+ # protected
78
+ #
79
+ # #
80
+ # # MyListener doesn't accept launchitems
81
+ # #
82
+ # def filter_items (item)
83
+ # raise "launchitems not allowed" \
84
+ # if item.is_a?(OpenWFE::LaunchItem)
85
+ # end
86
+ # end
87
+ #
88
+ def filter_items (item)
89
89
 
90
- #raise(
91
- # "listener of class '#{self.class.name}' "+
92
- # "doesn't accept launchitems")
93
- end
94
- end
90
+ #raise(
91
+ # "listener of class '#{self.class.name}' "+
92
+ # "doesn't accept launchitems")
93
+ end
94
+ end
95
95
 
96
96
  end
97
97
 
@@ -2,31 +2,31 @@
2
2
  #--
3
3
  # Copyright (c) 2007-2008, John Mettraux, OpenWFE.org
4
4
  # All rights reserved.
5
- #
6
- # Redistribution and use in source and binary forms, with or without
5
+ #
6
+ # Redistribution and use in source and binary forms, with or without
7
7
  # modification, are permitted provided that the following conditions are met:
8
- #
8
+ #
9
9
  # . Redistributions of source code must retain the above copyright notice, this
10
- # list of conditions and the following disclaimer.
11
- #
12
- # . Redistributions in binary form must reproduce the above copyright notice,
13
- # this list of conditions and the following disclaimer in the documentation
10
+ # list of conditions and the following disclaimer.
11
+ #
12
+ # . Redistributions in binary form must reproduce the above copyright notice,
13
+ # this list of conditions and the following disclaimer in the documentation
14
14
  # and/or other materials provided with the distribution.
15
- #
15
+ #
16
16
  # . Neither the name of the "OpenWFE" nor the names of its contributors may be
17
17
  # used to endorse or promote products derived from this software without
18
18
  # specific prior written permission.
19
- #
20
- # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21
- # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22
- # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23
- # ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
24
- # LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25
- # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26
- # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27
- # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28
- # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29
- # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
19
+ #
20
+ # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21
+ # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22
+ # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23
+ # ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
24
+ # LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25
+ # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26
+ # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27
+ # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28
+ # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29
+ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30
30
  # POSSIBILITY OF SUCH DAMAGE.
31
31
  #++
32
32
  #
@@ -53,87 +53,87 @@ require 'openwfe/listeners/listener'
53
53
  #
54
54
  module OpenWFE
55
55
 
56
+ #
57
+ # Polls a directory for incoming workitems (as files).
58
+ #
59
+ # Workitems can be instances of InFlowWorkItem or LaunchItem.
60
+ #
61
+ # require 'openwfe/listeners/listeners'
62
+ #
63
+ # engine.add_workitem_listener(OpenWFE::FileListener, "500")
64
+ #
65
+ # In this example, the directory ./work/in/ will be polled every 500
66
+ # milliseconds for incoming workitems (or launchitems).
67
+ #
68
+ # You can override the load_object(path) method to manage other formats
69
+ # then YAML.
70
+ #
71
+ class FileListener < Service
72
+ include WorkItemListener
73
+ include Rufus::Schedulable
74
+
75
+ attr_reader :workdir
76
+
77
+ def initialize (service_name, application_context)
78
+
79
+ super
80
+
81
+ @workdir = get_work_directory + "/in/"
82
+
83
+ linfo { "new() workdir is '#{@workdir}'" }
84
+ end
85
+
56
86
  #
57
- # Polls a directory for incoming workitems (as files).
58
- #
59
- # Workitems can be instances of InFlowWorkItem or LaunchItem.
60
- #
61
- # require 'openwfe/listeners/listeners'
62
- #
63
- # engine.add_workitem_listener(OpenWFE::FileListener, "500")
64
- #
65
- # In this example, the directory ./work/in/ will be polled every 500
66
- # milliseconds for incoming workitems (or launchitems).
67
- #
68
- # You can override the load_object(path) method to manage other formats
69
- # then YAML.
87
+ # Will 'find' files in the work directory (by default ./work/in/),
88
+ # extract the workitem in them and feed it back to the engine.
70
89
  #
71
- class FileListener < Service
72
- include WorkItemListener
73
- include Rufus::Schedulable
74
-
75
- attr_reader :workdir
76
-
77
- def initialize (service_name, application_context)
78
-
79
- super
80
-
81
- @workdir = get_work_directory + "/in/"
90
+ def trigger (params)
91
+ # no synchronization for now
82
92
 
83
- linfo { "new() workdir is '#{@workdir}'" }
84
- end
85
-
86
- #
87
- # Will 'find' files in the work directory (by default ./work/in/),
88
- # extract the workitem in them and feed it back to the engine.
89
- #
90
- def trigger (params)
91
- # no synchronization for now
92
-
93
- ldebug { "trigger()" }
93
+ ldebug { "trigger()" }
94
94
 
95
- FileUtils.makedirs(@workdir) unless File.exist?(@workdir)
95
+ FileUtils.makedirs(@workdir) unless File.exist?(@workdir)
96
96
 
97
- Find.find(@workdir) do |path|
97
+ Find.find(@workdir) do |path|
98
98
 
99
- next if File.stat(path).directory?
99
+ next if File.stat(path).directory?
100
100
 
101
- ldebug { "trigger() considering file '#{path}'" }
101
+ ldebug { "trigger() considering file '#{path}'" }
102
102
 
103
- begin
103
+ begin
104
104
 
105
- object = load_object(path)
105
+ object = load_object(path)
106
106
 
107
- handle_item(object) if object
107
+ handle_item(object) if object
108
108
 
109
- rescue Exception => e
109
+ rescue Exception => e
110
110
 
111
- linfo do
112
- "trigger() failure while loading from '#{path}'. " +
113
- "Resuming... \n" +
114
- OpenWFE::exception_to_s(e)
115
- end
116
- end
117
- end
111
+ linfo do
112
+ "trigger() failure while loading from '#{path}'. " +
113
+ "Resuming... \n" +
114
+ OpenWFE::exception_to_s(e)
115
+ end
118
116
  end
117
+ end
118
+ end
119
119
 
120
- protected
120
+ protected
121
121
 
122
- #
123
- # Turns a file into a Ruby instance.
124
- # This base implementation does it via YAML.
125
- #
126
- def load_object (path)
122
+ #
123
+ # Turns a file into a Ruby instance.
124
+ # This base implementation does it via YAML.
125
+ #
126
+ def load_object (path)
127
127
 
128
- return nil unless path.match ".*\.yaml$"
128
+ return nil unless path.match ".*\.yaml$"
129
129
 
130
- object = YAML.load_file path
130
+ object = YAML.load_file path
131
131
 
132
- File.delete path
132
+ File.delete path
133
133
 
134
- object
135
- end
136
- end
134
+ object
135
+ end
136
+ end
137
137
 
138
138
  end
139
139
 
@@ -2,31 +2,31 @@
2
2
  #--
3
3
  # Copyright (c) 2007-2008, John Mettraux, OpenWFE.org
4
4
  # All rights reserved.
5
- #
6
- # Redistribution and use in source and binary forms, with or without
5
+ #
6
+ # Redistribution and use in source and binary forms, with or without
7
7
  # modification, are permitted provided that the following conditions are met:
8
- #
8
+ #
9
9
  # . Redistributions of source code must retain the above copyright notice, this
10
- # list of conditions and the following disclaimer.
11
- #
12
- # . Redistributions in binary form must reproduce the above copyright notice,
13
- # this list of conditions and the following disclaimer in the documentation
10
+ # list of conditions and the following disclaimer.
11
+ #
12
+ # . Redistributions in binary form must reproduce the above copyright notice,
13
+ # this list of conditions and the following disclaimer in the documentation
14
14
  # and/or other materials provided with the distribution.
15
- #
15
+ #
16
16
  # . Neither the name of the "OpenWFE" nor the names of its contributors may be
17
17
  # used to endorse or promote products derived from this software without
18
18
  # specific prior written permission.
19
- #
20
- # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21
- # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22
- # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23
- # ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
24
- # LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25
- # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26
- # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27
- # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28
- # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29
- # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
19
+ #
20
+ # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21
+ # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22
+ # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23
+ # ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
24
+ # LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25
+ # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26
+ # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27
+ # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28
+ # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29
+ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30
30
  # POSSIBILITY OF SUCH DAMAGE.
31
31
  #++
32
32
  #
@@ -53,220 +53,220 @@ require 'openwfe/listeners/listener'
53
53
  #
54
54
  module OpenWFE
55
55
 
56
+ #
57
+ # Listens for workitems on a socket.
58
+ #
59
+ # Workitems can be instances of InFlowWorkItem or LaunchItem.
60
+ #
61
+ # By default, listens on port 7007.
62
+ #
63
+ # require 'openwfe/listeners/socketlisteners'
64
+ #
65
+ # engine.add_workitem_listener(OpenWFE::SocketListener)
66
+ #
67
+ # But you can be more specific :
68
+ #
69
+ # engine.add_workitem_listener(
70
+ # OpenWFE::SocketListener.new(
71
+ # "sl_whatever_name",
72
+ # engine.application_context,
73
+ # "target.host.xx",
74
+ # 7707)
75
+ #
76
+ class SocketListener < Service
77
+ include WorkItemListener
78
+
79
+ attr_reader :server, :thread
80
+
81
+ def initialize (service_name, application_context, port=nil, iface=nil)
82
+
83
+ super(service_name, application_context)
84
+
85
+ #iface ||= "127.0.0.1"
86
+ # not necessary
87
+
88
+ port ||= 7007
89
+
90
+ @server = TCPServer.new(iface, port)
91
+
92
+ @thread = OpenWFE.call_in_thread(@service_name, self) do
93
+ listen
94
+ end
95
+ end
96
+
56
97
  #
57
- # Listens for workitems on a socket.
58
- #
59
- # Workitems can be instances of InFlowWorkItem or LaunchItem.
60
- #
61
- # By default, listens on port 7007.
62
- #
63
- # require 'openwfe/listeners/socketlisteners'
64
- #
65
- # engine.add_workitem_listener(OpenWFE::SocketListener)
98
+ # Stops this socket listener (shuts down its socket)
66
99
  #
67
- # But you can be more specific :
100
+ def stop
101
+
102
+ @thread.raise "shutdown"
103
+
104
+ begin
105
+ @server.close
106
+ rescue Exception => e
107
+ ldebug { "stop() exc : #{e.to_s}" }
108
+ end
109
+ #begin
110
+ # @server.shutdown
111
+ #rescue Exception => e
112
+ # ldebug { "stop() exc : #{e.to_s}" }
113
+ #end
114
+
115
+ linfo { "stop() shut socket down" }
116
+ end
117
+
68
118
  #
69
- # engine.add_workitem_listener(
70
- # OpenWFE::SocketListener.new(
71
- # "sl_whatever_name",
72
- # engine.application_context,
73
- # "target.host.xx",
74
- # 7707)
119
+ # This base implementation is capable of decoding XML workitems
120
+ # and YAML workitems.
75
121
  #
76
- class SocketListener < Service
77
- include WorkItemListener
78
-
79
- attr_reader :server, :thread
122
+ def decode_workitem (data)
80
123
 
81
- def initialize (service_name, application_context, port=nil, iface=nil)
124
+ return nil if not data or data.length < 4
82
125
 
83
- super(service_name, application_context)
84
-
85
- #iface ||= "127.0.0.1"
86
- # not necessary
87
-
88
- port ||= 7007
89
-
90
- @server = TCPServer.new(iface, port)
91
-
92
- @thread = OpenWFE.call_in_thread(@service_name, self) do
93
- listen
94
- end
95
- end
96
-
97
- #
98
- # Stops this socket listener (shuts down its socket)
126
+ if data[0, 1] == "<"
99
127
  #
100
- def stop
101
-
102
- @thread.raise "shutdown"
103
-
104
- begin
105
- @server.close
106
- rescue Exception => e
107
- ldebug { "stop() exc : #{e.to_s}" }
108
- end
109
- #begin
110
- # @server.shutdown
111
- #rescue Exception => e
112
- # ldebug { "stop() exc : #{e.to_s}" }
113
- #end
114
-
115
- linfo { "stop() shut socket down" }
116
- end
117
-
118
- #
119
- # This base implementation is capable of decoding XML workitems
120
- # and YAML workitems.
121
- #
122
- def decode_workitem (data)
123
-
124
- return nil if not data or data.length < 4
125
-
126
- if data[0, 1] == "<"
127
- #
128
- # seems like XML
128
+ # seems like XML
129
129
 
130
- OpenWFE::XmlCodec::decode(data)
130
+ OpenWFE::XmlCodec::decode(data)
131
131
 
132
- elsif data[0, 3] == "---"
133
- #
134
- # must be YAML
135
-
136
- YAML.load(data)
137
-
138
- else
139
- #
140
- # perhaps OpenWFEja style header + workitem
132
+ elsif data[0, 3] == "---"
133
+ #
134
+ # must be YAML
141
135
 
142
- data = pop_line(data)
143
- data = pop_line(data)
136
+ YAML.load(data)
144
137
 
145
- decode_workitem(data)
146
- end
147
- end
148
-
149
- #
150
- # Simply pipes back the result of get_engine.reply(wi) on the
151
- # socket.
138
+ else
152
139
  #
153
- def reply_to_socket (socket, result)
140
+ # perhaps OpenWFEja style header + workitem
154
141
 
155
- socket.puts result.to_s
156
- socket.puts
157
- socket.close_write
142
+ data = pop_line(data)
143
+ data = pop_line(data)
158
144
 
159
- #ldebug { "reply_to_socket() result is >#{result}<" }
160
- end
145
+ decode_workitem(data)
146
+ end
147
+ end
161
148
 
162
- #
163
- # The base implementation allows returns true.
164
- #
165
- # An override of this method might check the origin of the socket
166
- # and maybe only allow a certain range of hosts...
167
- #
168
- def is_allowed? (socket)
149
+ #
150
+ # Simply pipes back the result of get_engine.reply(wi) on the
151
+ # socket.
152
+ #
153
+ def reply_to_socket (socket, result)
169
154
 
170
- true
171
- end
155
+ socket.puts result.to_s
156
+ socket.puts
157
+ socket.close_write
172
158
 
173
- protected
159
+ #ldebug { "reply_to_socket() result is >#{result}<" }
160
+ end
174
161
 
175
- #
176
- # Where the socket waiting loop is...
177
- #
178
- def listen
162
+ #
163
+ # The base implementation allows returns true.
164
+ #
165
+ # An override of this method might check the origin of the socket
166
+ # and maybe only allow a certain range of hosts...
167
+ #
168
+ def is_allowed? (socket)
179
169
 
180
- linfo { "listen() listening on #{@server.addr.join(' ')}" }
170
+ true
171
+ end
181
172
 
182
- loop do
173
+ protected
183
174
 
184
- socket = nil
175
+ #
176
+ # Where the socket waiting loop is...
177
+ #
178
+ def listen
185
179
 
186
- begin
187
- socket = @server.accept
188
- rescue Exception => e
189
- linfo { "listen() shut down '#{e}'" }
190
- end
180
+ linfo { "listen() listening on #{@server.addr.join(' ')}" }
191
181
 
192
- return unless socket
182
+ loop do
193
183
 
194
- OpenWFE.call_in_thread(@service_name, self) do
195
- handle_socket(socket) if socket and is_allowed?(socket)
196
- end
197
- end
198
- end
184
+ socket = nil
199
185
 
200
- #
201
- # The bulk work of handling a connection is done here. The
202
- # incoming workitem is piped to the engine, then the result
203
- # it written back a string on the socket which then gets closed.
204
- #
205
- def handle_socket (socket)
186
+ begin
187
+ socket = @server.accept
188
+ rescue Exception => e
189
+ linfo { "listen() shut down '#{e}'" }
190
+ end
206
191
 
207
- ldebug do
208
- "handle_socket() "+
209
- "connection from #{socket.peeraddr.join(' ')}"
210
- end
192
+ return unless socket
211
193
 
212
- data = ""
213
- loop do
214
- s = socket.gets
215
- break unless s
216
- data += s
217
- end
194
+ OpenWFE.call_in_thread(@service_name, self) do
195
+ handle_socket(socket) if socket and is_allowed?(socket)
196
+ end
197
+ end
198
+ end
199
+
200
+ #
201
+ # The bulk work of handling a connection is done here. The
202
+ # incoming workitem is piped to the engine, then the result
203
+ # it written back a string on the socket which then gets closed.
204
+ #
205
+ def handle_socket (socket)
206
+
207
+ ldebug do
208
+ "handle_socket() "+
209
+ "connection from #{socket.peeraddr.join(' ')}"
210
+ end
211
+
212
+ data = ""
213
+ loop do
214
+ s = socket.gets
215
+ break unless s
216
+ data += s
217
+ end
218
218
 
219
- wi = decode_workitem(data)
219
+ wi = decode_workitem(data)
220
220
 
221
- if not wi
221
+ if not wi
222
222
 
223
- ldebug do
224
- "handle_socket() "+
225
- ">>>#{data}<<< doesn't contain a workitem"
226
- end
227
- socket.close
228
- return
223
+ ldebug do
224
+ "handle_socket() "+
225
+ ">>>#{data}<<< doesn't contain a workitem"
226
+ end
227
+ socket.close
228
+ return
229
229
 
230
- else
230
+ else
231
231
 
232
- ldebug do
233
- "handle_socket() "+
234
- "received something of class #{wi.class}"
235
- end
236
- end
232
+ ldebug do
233
+ "handle_socket() "+
234
+ "received something of class #{wi.class}"
235
+ end
236
+ end
237
237
 
238
- result = nil
238
+ result = nil
239
239
 
240
- begin
240
+ begin
241
241
 
242
- #result = get_engine.reply(wi)
243
- #result = handle_item(wi)
244
- handle_item wi
242
+ #result = get_engine.reply(wi)
243
+ #result = handle_item(wi)
244
+ handle_item wi
245
245
 
246
- result = "<ok-reply/>"
246
+ result = "<ok-reply/>"
247
247
 
248
- ldebug { "handle_socket() result is >>#{result}<<" }
248
+ ldebug { "handle_socket() result is >>#{result}<<" }
249
249
 
250
- rescue Exception => e
250
+ rescue Exception => e
251
251
 
252
- result = "ERROR\n\n"
253
- result << OpenWFE::exception_to_s(e)
252
+ result = "ERROR\n\n"
253
+ result << OpenWFE::exception_to_s(e)
254
254
 
255
- ldebug { "handle_socket() error reply :\n" + result }
256
- end
255
+ ldebug { "handle_socket() error reply :\n" + result }
256
+ end
257
257
 
258
- reply_to_socket(socket, result)
258
+ reply_to_socket(socket, result)
259
259
 
260
- socket.close
261
- end
260
+ socket.close
261
+ end
262
262
 
263
- def pop_line (s)
263
+ def pop_line (s)
264
264
 
265
- i = s.index("\n")
266
- return s unless i
267
- s[i+1..-1]
268
- end
269
- end
265
+ i = s.index("\n")
266
+ return s unless i
267
+ s[i+1..-1]
268
+ end
269
+ end
270
270
 
271
271
  end
272
272