yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix syntax error

This commit is contained in:
Feng 2016-02-28 23:49:10 +08:00
parent 5575c7d7fe
commit d1bb0e04fd
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/source/commands.rst
View File

@ -596,11 +596,11 @@ Trace MQTT packets, messages(sent/received) by ClientId or Topic.
+-----------------------------------+-----------------------------------+
| trace client <ClientId> <LogFile> | Trace a client |
+-----------------------------------+-----------------------------------+
| trace client <ClientId> off | Stop to trace the client |
| trace client <ClientId> off | Stop tracing the client |
+-----------------------------------+-----------------------------------+
| trace topic <Topic> <LogFile> | Trace a topic |
+-----------------------------------+-----------------------------------+
| trace topic <Topic> off | Stop to trace the topic |
| trace topic <Topic> off | Stop tracing the topic |
+-----------------------------------+-----------------------------------+
trace client <ClientId> <LogFile>
@ -615,11 +615,11 @@ Start to trace a client::
trace client <ClientId> off
---------------------------
Stop to trace the client::
Stop tracing the client::
$ ./bin/emqttd_ctl trace client clientid off
stop to trace client clientid successfully.
stop tracing client clientid successfully.
trace topic <Topic> <LogFile>
-----------------------------
@ -633,11 +633,11 @@ Start to trace a topic::
trace topic <Topic> off
-----------------------
Stop to trace the topic::
Stop tracing the topic::
$ ./bin/emqttd_ctl trace topic topic off
stop to trace topic topic successfully.
stop tracing topic topic successfully.
trace list
----------

6
docs/source/getstarted.rst
View File

@ -11,7 +11,7 @@ Overview
emqttd(Erlang MQTT Broker) is an open source MQTT broker written in Erlang/OTP. Erlang/OTP is a concurrent, fault-tolerant, soft-realtime and distributed programming platform. MQTT is an extremely lightweight publish/subscribe messaging protocol powering IoT, M2M and Mobile applications.
The emqttd project is aimed to implement a scalable, distributed, extensible open-source MQTT broker for IoT, M2M and Mobile applications that hope to handle ten millions of concurrent MQTT clients.
The emqttd project is aimed to implement a scalable, distributed, extensible open-source MQTT broker for IoT, M2M and Mobile applications that hope to handle millions of concurrent MQTT clients.
Highlights of the emqttd broker:
@ -93,7 +93,7 @@ Web Dashboard
A Web Dashboard will be loaded automatically when the emqttd broker is started successfully.
The Dashboard helps to check running status of the broker, monitor statistics and metrics of MQTT packets, query clients, sessions, topics and subscriptions.
The Dashboard helps check running status of the broker, monitor statistics and metrics of MQTT packets, query clients, sessions, topics and subscriptions.
+------------------+---------------------------+
| Default Address | http://localhost:18083 |
@ -109,7 +109,7 @@ The Dashboard helps to check running status of the broker, monitor statistics an
Modules and Plugins
-------------------
The Authentication and ACL mechanism is usually implemented by a Module or Plugin.
The Authentication and Authorization(ACL) are usually implemented by a Module or Plugin.
Modules
-------

2
docs/source/index.rst
View File

@ -7,7 +7,7 @@
emqttd - Erlang MQTT Broker
===========================
emqttd(Erlang MQTT Broker) is a massively scalable, clusterable MQTT V3.1/V3.1.1 broker written in Erlang/OTP.
emqttd(Erlang MQTT Broker) is a massively scalable and clusterable MQTT V3.1/V3.1.1 broker written in Erlang/OTP.
emqttd is fully open source and licensed under the Apache Version 2.0. emqttd implements both MQTT V3.1 and V3.1.1 protocol specifications, and supports WebSocket, STOMP, SockJS, CoAP and MQTT-SN in the same time.

4
docs/source/install.rst
View File

@ -120,7 +120,7 @@ We could install the broker on Mac OS X to develop and debug MQTT applications.
Download Mac Package from: http://emqtt.io/downloads/macosx
Configure 'lager' log level in 'etc/emqttd.config', all MQTT messages recevied/sent will be printd on console:
Configure 'lager' log level in 'etc/emqttd.config', all MQTT messages recevied/sent will be printed on console:
.. code:: erlang
@ -132,7 +132,7 @@ Configure 'lager' log level in 'etc/emqttd.config', all MQTT messages recevied/s
]}
]},
The install and boot process on Mac is same to Linux.
The install and boot process on Mac are same to Linux.
---------------------
Installing on Windows

8
src/emqttd_cli.erl
View File

@ -405,9 +405,9 @@ trace(["topic", Topic, LogFile]) ->
trace(_) ->
?USAGE([{"trace list", "query all traces"},
{"trace client <ClientId> <LogFile>","trace client with ClientId"},
{"trace client <ClientId> off", "stop to trace client"},
{"trace client <ClientId> off", "stop tracing client"},
{"trace topic <Topic> <LogFile>", "trace topic with Topic"},
{"trace topic <Topic> off", "stop to trace Topic"}]).
{"trace topic <Topic> off", "stop tracing Topic"}]).
trace_on(Who, Name, LogFile) ->
case emqttd_trace:start_trace({Who, iolist_to_binary(Name)}, LogFile) of
@ -420,9 +420,9 @@ trace_on(Who, Name, LogFile) ->
trace_off(Who, Name) ->
case emqttd_trace:stop_trace({Who, iolist_to_binary(Name)}) of
ok ->
?PRINT("stop to trace ~s ~s successfully.~n", [Who, Name]);
?PRINT("stop tracing ~s ~s successfully.~n", [Who, Name]);
{error, Error} ->
?PRINT("stop to trace ~s ~s error: ~p.~n", [Who, Name, Error])
?PRINT("stop tracing ~s ~s error: ~p.~n", [Who, Name, Error])
end.
%%--------------------------------------------------------------------