Tue, 13 Jan 2009 19:41:52 +0500
datamanager: Change log message from type "warn" to "debug" when loading a file fails
615 | 1 | -- Prosody IM v0.2 |
519
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
461
diff
changeset
|
2 | -- Copyright (C) 2008 Matthew Wild |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
461
diff
changeset
|
3 | -- Copyright (C) 2008 Waqas Hussain |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
461
diff
changeset
|
4 | -- |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
461
diff
changeset
|
5 | -- This program is free software; you can redistribute it and/or |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
461
diff
changeset
|
6 | -- modify it under the terms of the GNU General Public License |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
461
diff
changeset
|
7 | -- as published by the Free Software Foundation; either version 2 |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
461
diff
changeset
|
8 | -- of the License, or (at your option) any later version. |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
461
diff
changeset
|
9 | -- |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
461
diff
changeset
|
10 | -- This program is distributed in the hope that it will be useful, |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
461
diff
changeset
|
11 | -- but WITHOUT ANY WARRANTY; without even the implied warranty of |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
461
diff
changeset
|
12 | -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
461
diff
changeset
|
13 | -- GNU General Public License for more details. |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
461
diff
changeset
|
14 | -- |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
461
diff
changeset
|
15 | -- You should have received a copy of the GNU General Public License |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
461
diff
changeset
|
16 | -- along with this program; if not, write to the Free Software |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
461
diff
changeset
|
17 | -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
461
diff
changeset
|
18 | -- |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
461
diff
changeset
|
19 | |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
461
diff
changeset
|
20 | |
382 | 21 | |
22 | local connlisteners_register = require "net.connlisteners".register; | |
23 | ||
24 | local console_listener = { default_port = 5582; default_mode = "*l"; }; | |
25 | ||
26 | local commands = {}; | |
411 | 27 | local def_env = {}; |
28 | local default_env_mt = { __index = def_env }; | |
382 | 29 | |
30 | console = {}; | |
31 | ||
32 | function console:new_session(conn) | |
669
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
33 | local w = function(s) conn.write(s:gsub("\n", "\r\n")); end; |
411 | 34 | local session = { conn = conn; |
382 | 35 | send = function (t) w(tostring(t)); end; |
565
3a49d85cafbc
Backed out changeset 099d8a102deb (committed too much)
Matthew Wild <mwild1@gmail.com>
parents:
563
diff
changeset
|
36 | print = function (t) w("| "..tostring(t).."\n"); end; |
382 | 37 | disconnect = function () conn.close(); end; |
38 | }; | |
411 | 39 | session.env = setmetatable({}, default_env_mt); |
40 | ||
41 | -- Load up environment with helper objects | |
42 | for name, t in pairs(def_env) do | |
43 | if type(t) == "table" then | |
44 | session.env[name] = setmetatable({ session = session }, { __index = t }); | |
45 | end | |
46 | end | |
47 | ||
48 | return session; | |
382 | 49 | end |
50 | ||
51 | local sessions = {}; | |
52 | ||
53 | function console_listener.listener(conn, data) | |
54 | local session = sessions[conn]; | |
55 | ||
56 | if not session then | |
57 | -- Handle new connection | |
58 | session = console:new_session(conn); | |
59 | sessions[conn] = session; | |
440 | 60 | printbanner(session); |
382 | 61 | end |
62 | if data then | |
63 | -- Handle data | |
669
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
64 | (function(session, data) |
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
65 | if data:match("[!.]$") then |
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
66 | local command = data:lower(); |
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
67 | command = data:match("^%w+") or data:match("%p"); |
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
68 | if commands[command] then |
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
69 | commands[command](session, data); |
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
70 | return; |
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
71 | end |
382 | 72 | end |
669
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
73 | |
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
74 | session.env._ = data; |
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
75 | |
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
76 | local chunk, err = loadstring("return "..data); |
382 | 77 | if not chunk then |
669
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
78 | chunk, err = loadstring(data); |
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
79 | if not chunk then |
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
80 | err = err:gsub("^%[string .-%]:%d+: ", ""); |
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
81 | err = err:gsub("^:%d+: ", ""); |
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
82 | err = err:gsub("'<eof>'", "the end of the line"); |
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
83 | session.print("Sorry, I couldn't understand that... "..err); |
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
84 | return; |
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
85 | end |
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
86 | end |
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
87 | |
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
88 | setfenv(chunk, session.env); |
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
89 | local ranok, taskok, message = pcall(chunk); |
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
90 | |
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
91 | if not ranok then |
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
92 | session.print("Fatal error while running command, it did not complete"); |
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
93 | session.print("Error: "..taskok); |
382 | 94 | return; |
95 | end | |
669
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
96 | |
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
97 | if not message then |
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
98 | session.print("Result: "..tostring(taskok)); |
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
99 | return; |
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
100 | elseif (not taskok) and message then |
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
101 | session.print("Command completed with a problem"); |
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
102 | session.print("Message: "..tostring(message)); |
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
103 | return; |
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
104 | end |
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
105 | |
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
106 | session.print("OK: "..tostring(message)); |
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
107 | end)(session, data); |
382 | 108 | end |
669
9255abbb3068
mod_console: replace all \n with \r\n in the output, and send \0 as a marker character after every response
Waqas Hussain <waqas20@gmail.com>
parents:
615
diff
changeset
|
109 | session.send(string.char(0)); |
382 | 110 | end |
111 | ||
112 | function console_listener.disconnect(conn, err) | |
113 | ||
114 | end | |
115 | ||
116 | connlisteners_register('console', console_listener); | |
117 | ||
118 | -- Console commands -- | |
119 | -- These are simple commands, not valid standalone in Lua | |
120 | ||
121 | function commands.bye(session) | |
122 | session.print("See you! :)"); | |
123 | session.disconnect(); | |
124 | end | |
125 | ||
126 | commands["!"] = function (session, data) | |
127 | if data:match("^!!") then | |
128 | session.print("!> "..session.env._); | |
129 | return console_listener.listener(session.conn, session.env._); | |
130 | end | |
131 | local old, new = data:match("^!(.-[^\\])!(.-)!$"); | |
132 | if old and new then | |
133 | local ok, res = pcall(string.gsub, session.env._, old, new); | |
134 | if not ok then | |
135 | session.print(res) | |
136 | return; | |
137 | end | |
138 | session.print("!> "..res); | |
139 | return console_listener.listener(session.conn, res); | |
140 | end | |
141 | session.print("Sorry, not sure what you want"); | |
142 | end | |
143 | ||
144 | -- Session environment -- | |
411 | 145 | -- Anything in def_env will be accessible within the session as a global variable |
382 | 146 | |
411 | 147 | def_env.server = {}; |
148 | function def_env.server:reload() | |
461
8e66201f566a
Load prosody instead of main.lia in mod_console
Waqas Hussain <waqas20@gmail.com>
parents:
444
diff
changeset
|
149 | dofile "prosody" |
382 | 150 | return true, "Server reloaded"; |
151 | end | |
152 | ||
411 | 153 | def_env.module = {}; |
444
77485b9b840c
Add module:unload() to mod_console, and allow module:load() to take config param
Matthew Wild <mwild1@gmail.com>
parents:
440
diff
changeset
|
154 | function def_env.module:load(name, host, config) |
382 | 155 | local mm = require "modulemanager"; |
444
77485b9b840c
Add module:unload() to mod_console, and allow module:load() to take config param
Matthew Wild <mwild1@gmail.com>
parents:
440
diff
changeset
|
156 | local ok, err = mm.load(host or self.env.host, name, config); |
382 | 157 | if not ok then |
158 | return false, err or "Unknown error loading module"; | |
159 | end | |
160 | return true, "Module loaded"; | |
161 | end | |
162 | ||
444
77485b9b840c
Add module:unload() to mod_console, and allow module:load() to take config param
Matthew Wild <mwild1@gmail.com>
parents:
440
diff
changeset
|
163 | function def_env.module:unload(name, host) |
77485b9b840c
Add module:unload() to mod_console, and allow module:load() to take config param
Matthew Wild <mwild1@gmail.com>
parents:
440
diff
changeset
|
164 | local mm = require "modulemanager"; |
77485b9b840c
Add module:unload() to mod_console, and allow module:load() to take config param
Matthew Wild <mwild1@gmail.com>
parents:
440
diff
changeset
|
165 | local ok, err = mm.unload(host or self.env.host, name); |
77485b9b840c
Add module:unload() to mod_console, and allow module:load() to take config param
Matthew Wild <mwild1@gmail.com>
parents:
440
diff
changeset
|
166 | if not ok then |
77485b9b840c
Add module:unload() to mod_console, and allow module:load() to take config param
Matthew Wild <mwild1@gmail.com>
parents:
440
diff
changeset
|
167 | return false, err or "Unknown error unloading module"; |
77485b9b840c
Add module:unload() to mod_console, and allow module:load() to take config param
Matthew Wild <mwild1@gmail.com>
parents:
440
diff
changeset
|
168 | end |
77485b9b840c
Add module:unload() to mod_console, and allow module:load() to take config param
Matthew Wild <mwild1@gmail.com>
parents:
440
diff
changeset
|
169 | return true, "Module unloaded"; |
77485b9b840c
Add module:unload() to mod_console, and allow module:load() to take config param
Matthew Wild <mwild1@gmail.com>
parents:
440
diff
changeset
|
170 | end |
77485b9b840c
Add module:unload() to mod_console, and allow module:load() to take config param
Matthew Wild <mwild1@gmail.com>
parents:
440
diff
changeset
|
171 | |
411 | 172 | def_env.config = {}; |
173 | function def_env.config:load(filename, format) | |
174 | local config_load = require "core.configmanager".load; | |
175 | local ok, err = config_load(filename, format); | |
382 | 176 | if not ok then |
177 | return false, err or "Unknown error loading config"; | |
178 | end | |
179 | return true, "Config loaded"; | |
180 | end | |
411 | 181 | |
182 | function def_env.config:get(host, section, key) | |
183 | local config_get = require "core.configmanager".get | |
184 | return true, tostring(config_get(host, section, key)); | |
185 | end | |
186 | ||
187 | def_env.hosts = {}; | |
188 | function def_env.hosts:list() | |
189 | for host, host_session in pairs(hosts) do | |
190 | self.session.print(host); | |
191 | end | |
192 | return true, "Done"; | |
193 | end | |
194 | ||
195 | function def_env.hosts:add(name) | |
196 | end | |
440 | 197 | |
198 | ------------- | |
199 | ||
200 | function printbanner(session) | |
201 | session.print [[ | |
202 | ____ \ / _ | |
203 | | _ \ _ __ ___ ___ _-_ __| |_ _ | |
204 | | |_) | '__/ _ \/ __|/ _ \ / _` | | | | | |
205 | | __/| | | (_) \__ \ |_| | (_| | |_| | | |
206 | |_| |_| \___/|___/\___/ \__,_|\__, | | |
207 | A study in simplicity |___/ | |
208 | ||
209 | ]] | |
210 | session.print("Welcome to the Prosody administration console. For a list of commands, type: help"); | |
211 | session.print("You may find more help on using this console in our online documentation at "); | |
212 | session.print("http://prosody.im/doc/console\n"); | |
213 | end |