2 files changed, 7 insertions, 3 deletions

diff --git a/bin/emq-cli b/bin/emq-cli
index 52cf180..0c065fe 100755
--- a/bin/emq-cli
+++ b/bin/emq-cli
@@ -95,6 +95,10 @@ class Shell(cmd.Cmd):
         self.send_message('STATUS')
         pprint(self.recv_reply())
 
+    def do_show_scheduled_jobs(self, line):
+        self.send_message('SCHEDULER_SHOW_SCHEDULED_JOBS')
+        pprint(self.recv_reply())
+
     def do_show_workers(self, line):
         """
         Request the status of the connected workers and queues
diff --git a/eventmq/utils/messages.py b/eventmq/utils/messages.py
index 524cb8e..b664594 100644
--- a/eventmq/utils/messages.py
+++ b/eventmq/utils/messages.py
@@ -89,7 +89,7 @@ def generate_msgid(prefix=None):
     return id if not prefix else str(prefix) + id
 
 
-def send_emqp_message(socket, command, msgid=None, message=None):
+def send_emqp_message(socket, command, message=None, msgid=None):
     """
     Formats and sends an eMQP message
 
@@ -117,8 +117,8 @@ def send_emqp_message(socket, command, msgid=None, message=None):
     return msgid
 
 
-def send_emqp_router_message(socket, recipient_id, command, msgid=None,
-                             message=None):
+def send_emqp_router_message(socket, recipient_id, command,
+                             message=None, msgid=None):
     """
     Formats and sends an eMQP message taking into account the recipient frame
     used by a :attr:`zmq.ROUTER` device.