Skip to content

Update apm.py #1

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

Merged
loganbeal merged 3 commits into from
Feb 1, 2018
Merged

Update apm.py #1

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f0c6547
Update apm.py
seanlane Jan 31, 2018
0f9af9c
Update apm.py
seanlane Jan 31, 2018
4b722ef
Update apm.py
seanlane Jan 31, 2018
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
16 changes: 10 additions & 6 deletions apm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@

if ver==2: # Python 2

def cmd(server, app, aline):
def cmd(server, app, aline, disp=True):
'''Send a request to the server \n \
server = address of server \n \
app = application name \n \
aline = line to send to server \n'''
aline = line to send to server \n \
disp = Print output \n'''
try:
# Web-server URL address
url_base = string.strip(server) + '/online/apm_line.php'
Expand All @@ -40,7 +41,8 @@ def cmd(server, app, aline):
if not char:
break
elif char == '\n':
print(line)
if disp:
print(line)
line = ''
else:
line += char
Expand Down Expand Up @@ -308,11 +310,12 @@ def load_meas(server,app,name,value):

else: # Python 3+

def cmd(server,app,aline):
def cmd(server,app,aline, disp=True):
'''Send a request to the server \n \
server = address of server \n \
app = application name \n \
aline = line to send to server \n'''
aline = line to send to server \n \
disp = Print output \n'''
try:
# Web-server URL address
url_base = server.strip() + '/online/apm_line.php'
Expand All @@ -330,7 +333,8 @@ def cmd(server,app,aline):
if not char:
break
elif char == '\n':
print(line)
if disp:
print(line)
line = ''
else:
line += char
Expand Down