mirror of https://gitlab.com/ita1024/waf.git
cleanup
This commit is contained in:
parent
fa8d113d41
commit
f10accf861
|
@ -56,10 +56,11 @@ if 1:
|
|||
PORT = 51200
|
||||
|
||||
def make_server(bld, idx):
|
||||
wd = os.path.dirname(os.path.abspath('__file__'))
|
||||
#wd = os.path.dirname(os.path.abspath('__file__'))
|
||||
wd = "/home/tnagy/"
|
||||
port = PORT + idx
|
||||
cmd = "java -cp %s/minimal-json-0.9.3-SNAPSHOT.jar:. Prefork %d" % (wd, PORT)
|
||||
proc = subprocess.Popen(cmd.split(), shell=False, cwd=d)
|
||||
proc = subprocess.Popen(cmd.split(), shell=False, cwd=wd)
|
||||
proc.port = port
|
||||
return proc
|
||||
|
||||
|
@ -84,17 +85,26 @@ if 1:
|
|||
atexit.register(close_all)
|
||||
|
||||
def put_data(conn, data):
|
||||
conn.send(data)
|
||||
cnt = 0
|
||||
while cnt < len(data):
|
||||
sent = conn.send(data[cnt:])
|
||||
if sent == 0:
|
||||
raise RuntimeError('connection ended')
|
||||
cnt += sent
|
||||
|
||||
def read_data(conn, siz):
|
||||
ret = conn.recv(siz)
|
||||
#if not ret:
|
||||
# print("closed connection?")
|
||||
assert(len(ret) == siz)
|
||||
cnt = 0
|
||||
buf = []
|
||||
while cnt < siz:
|
||||
data = conn.recv(min(siz - cnt, 1024))
|
||||
if not data:
|
||||
raise RuntimeError('connection ended %r %r' % (cnt, siz))
|
||||
buf.append(data)
|
||||
cnt += len(data)
|
||||
ret = ''.join(buf)
|
||||
return ret
|
||||
|
||||
def exec_command(self, cmd, **kw):
|
||||
|
||||
if 'stdout' in kw:
|
||||
if kw['stdout'] not in (None, subprocess.PIPE):
|
||||
return self.exec_command_old(cmd, **kw)
|
||||
|
|
|
@ -87,6 +87,7 @@ class req(SocketServer.StreamRequestHandler):
|
|||
self.wfile.write(make_header(params))
|
||||
if data:
|
||||
self.wfile.write(data)
|
||||
self.wfile.flush()
|
||||
|
||||
def process_command(self):
|
||||
query = self.rfile.read(HEADER_SIZE)
|
||||
|
@ -229,17 +230,26 @@ else:
|
|||
atexit.register(close_all)
|
||||
|
||||
def put_data(conn, data):
|
||||
conn.send(data)
|
||||
cnt = 0
|
||||
while cnt < len(data):
|
||||
sent = conn.send(data[cnt:])
|
||||
if sent == 0:
|
||||
raise RuntimeError('connection ended')
|
||||
cnt += sent
|
||||
|
||||
def read_data(conn, siz):
|
||||
ret = conn.recv(siz)
|
||||
#if not ret:
|
||||
# print("closed connection?")
|
||||
assert(len(ret) == siz)
|
||||
cnt = 0
|
||||
buf = []
|
||||
while cnt < siz:
|
||||
data = conn.recv(min(siz - cnt, 1024))
|
||||
if not data:
|
||||
raise RuntimeError('connection ended %r %r' % (cnt, siz))
|
||||
buf.append(data)
|
||||
cnt += len(data)
|
||||
ret = ''.join(buf)
|
||||
return ret
|
||||
|
||||
def exec_command(self, cmd, **kw):
|
||||
|
||||
if 'stdout' in kw:
|
||||
if kw['stdout'] not in (None, subprocess.PIPE):
|
||||
return self.exec_command_old(cmd, **kw)
|
||||
|
|
|
@ -19,11 +19,7 @@ To use::
|
|||
more code
|
||||
"""
|
||||
|
||||
import os, re, socket, threading, sys, subprocess, time, atexit, traceback, random
|
||||
try:
|
||||
import SocketServer
|
||||
except ImportError:
|
||||
import socketserver as SocketServer
|
||||
import os, re, socket, threading, sys, subprocess, atexit, traceback
|
||||
try:
|
||||
from queue import Queue
|
||||
except ImportError:
|
||||
|
@ -173,17 +169,26 @@ if 1:
|
|||
atexit.register(close_all)
|
||||
|
||||
def put_data(conn, data):
|
||||
conn.send(data)
|
||||
cnt = 0
|
||||
while cnt < len(data):
|
||||
sent = conn.send(data[cnt:])
|
||||
if sent == 0:
|
||||
raise RuntimeError('connection ended')
|
||||
cnt += sent
|
||||
|
||||
def read_data(conn, siz):
|
||||
ret = conn.recv(siz)
|
||||
#if not ret:
|
||||
# print("closed connection?")
|
||||
assert(len(ret) == siz)
|
||||
cnt = 0
|
||||
buf = []
|
||||
while cnt < siz:
|
||||
data = conn.recv(min(siz - cnt, 1024))
|
||||
if not data:
|
||||
raise RuntimeError('connection ended %r %r' % (cnt, siz))
|
||||
buf.append(data)
|
||||
cnt += len(data)
|
||||
ret = ''.join(buf)
|
||||
return ret
|
||||
|
||||
def exec_command(self, cmd, **kw):
|
||||
|
||||
if 'stdout' in kw:
|
||||
if kw['stdout'] not in (None, subprocess.PIPE):
|
||||
return self.exec_command_old(cmd, **kw)
|
||||
|
|
Loading…
Reference in New Issue