Skip to content

support sending command #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mnikhil-git wants to merge 4 commits into
base: master
Choose a base branch
from
Open

support sending command #6

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b3e9566
support sending commands
mnikhil-git May 1, 2016
bafa0d0
Update livestatus.py
mnikhil-git May 1, 2016
0908639
Update livestatus.py
mnikhil-git May 1, 2016
42f55ad
Update livestatus.py
mnikhil-git May 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions mk_livestatus/livestatus.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import socket
import json

import time

__all__ = ['Query', 'Socket']

Expand All @@ -16,6 +16,7 @@ def __init__(self, conn, resource):
self._resource = resource
self._columns = []
self._filters = []
self._command = []

def call(self):
try:
Expand All @@ -27,13 +28,17 @@ def call(self):
__call__ = call

def __str__(self):
request = 'GET %s' % (self._resource)
if self._columns and any(self._columns):
request += '\nColumns: %s' % (' '.join(self._columns))
if self._filters:
for filter_line in self._filters:
request += '\nFilter: %s' % (filter_line)
request += '\nOutputFormat: json\nColumnHeaders: on\n'
if self._resource.upper() != 'SEND':
request = 'GET %s' % (self._resource)
if self._columns and any(self._columns):
request += '\nColumns: %s' % (' '.join(self._columns))
if self._filters:
for filter_line in self._filters:
request += '\nFilter: %s' % (filter_line)
request += '\nOutputFormat: json\nColumnHeaders: on\n'
else:
timestamp = str(int(time.time()))
request = "COMMAND [{0}] {1}\n".format(timestamp, ' '.join(self._command).encode('utf-8'))
return request

def columns(self, *args):
Expand All @@ -44,6 +49,9 @@ def filter(self, filter_str):
self._filters.append(filter_str)
return self

def command(self, command_str):
self._command.append(command_str)
return self

class Socket(object):
def __init__(self, peer):
Expand Down