diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2010-12-31 15:56:56 +0000 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2010-12-31 15:56:56 +0000 |
| commit | 360d1c61ba4b9bd586df6d30416781b568d994e4 (patch) | |
| tree | 27fa8e5be1548ebe2964d5b0c4172f59a20098d9 | |
| parent | requester gets now stored with commands (diff) | |
fixed typo
some cleanup
git-svn-id: https://svn.spreadspace.org/gcsd/trunk@92 ac14a137-c7f1-4531-abe0-07747231d213
| -rw-r--r-- | src/command_queue.lua | 2 | ||||
| -rw-r--r-- | src/main_loop.lua | 2 | ||||
| -rw-r--r-- | src/response_table.lua | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/src/command_queue.lua b/src/command_queue.lua index 861ccfc..bd25ac3 100644 --- a/src/command_queue.lua +++ b/src/command_queue.lua @@ -35,7 +35,7 @@ command_queue = {} command_queue.commands = {} command_queue.current = nil -function command_queue:enqueue(command, expected_response, requestor, timeout) +function command_queue:enqueue(command, expected_response, requester, timeout) if(not command) then log.printf(log.INFO, "ignoring empty command") end diff --git a/src/main_loop.lua b/src/main_loop.lua index e92c9b7..318edfd 100644 --- a/src/main_loop.lua +++ b/src/main_loop.lua @@ -124,7 +124,7 @@ function main_loop(opt) end end for _, writer in ipairs(writeable) do - ret = writer:write() + local ret = writer:write() if(ret == defines.KILL_MODULE_CLASS) then ret = module_list:unregister_by_class(writer.client_instance.module_instance.class) elseif(ret == defines.KILL_MODULE) then diff --git a/src/response_table.lua b/src/response_table.lua index f178d9c..2613d2a 100644 --- a/src/response_table.lua +++ b/src/response_table.lua @@ -51,8 +51,6 @@ function response_table:dispatch(response_buffer) if regex then local match = string.match(response_buffer, "^" .. regex, init) if match then - log.printf(log.DEBUG, "got expected response ('%s'), command completed", match) - -- TODO: send expected response to original requestor command_queue:command_completed(match) init = init + string.len(match) end |