mirror of https://github.com/oxen-io/lokinet
make pylokinet work
This commit is contained in:
parent
d89e58199a
commit
b521ba4670
13
Makefile
13
Makefile
|
@ -9,6 +9,8 @@ prefix = $(DESTDIR)/usr/local
|
|||
CC ?= cc
|
||||
CXX ?= c++
|
||||
|
||||
PYTHON ?= python3
|
||||
|
||||
SETCAP ?= which setcap && setcap cap_net_admin,cap_net_bind_service=+eip
|
||||
|
||||
SHADOW_ROOT ?= $(HOME)/.shadow
|
||||
|
@ -131,7 +133,7 @@ shadow-build: shadow-configure
|
|||
$(MAKE) -C $(BUILD_ROOT)
|
||||
|
||||
shadow-run: shadow-build
|
||||
python3 contrib/shadow/genconf.py $(SHADOW_CONFIG)
|
||||
$(PYTHON) contrib/shadow/genconf.py $(SHADOW_CONFIG)
|
||||
bash -c "$(SHADOW_BIN) -w $$(cat /proc/cpuinfo | grep processor | wc -l) $(SHADOW_CONFIG) | $(SHADOW_PARSE)"
|
||||
|
||||
shadow-plot: shadow-run
|
||||
|
@ -152,7 +154,7 @@ testnet-build: testnet-configure
|
|||
testnet:
|
||||
cp $(EXE) $(TESTNET_EXE)
|
||||
mkdir -p $(TESTNET_ROOT)
|
||||
python3 contrib/testnet/genconf.py --bin=$(TESTNET_EXE) --svc=$(TESTNET_SERVERS) --clients=$(TESTNET_CLIENTS) --dir=$(TESTNET_ROOT) --out $(TESTNET_CONF) --connect=4
|
||||
$(PYTHON) contrib/testnet/genconf.py --bin=$(TESTNET_EXE) --svc=$(TESTNET_SERVERS) --clients=$(TESTNET_CLIENTS) --dir=$(TESTNET_ROOT) --out $(TESTNET_CONF) --connect=4
|
||||
LLARP_DEBUG=$(TESTNET_DEBUG) supervisord -n -d $(TESTNET_ROOT) -l $(TESTNET_LOG) -c $(TESTNET_CONF)
|
||||
|
||||
$(TEST_EXE): debug
|
||||
|
@ -217,6 +219,13 @@ lint: $(LINT_CHECK)
|
|||
%.cpp-check: %.cpp
|
||||
clang-tidy $^ -- -I$(REPO)/include -I$(REPO)/crypto/include -I$(REPO)/llarp -I$(REPO)/vendor/cppbackport-master/lib
|
||||
|
||||
docker-kubernetes:
|
||||
docker build -f docker/loki-svc-kubernetes.Dockerfile .
|
||||
|
||||
install-pylokinet:
|
||||
cd $(REPO)/contrib/py/pylokinet && $(PYTHON) setup.py install
|
||||
|
||||
kubernetes-install: install install-pylokinet
|
||||
|
||||
docker-debian:
|
||||
docker build -f docker/debian.Dockerfile .
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
#!/usr/bin/env python3
|
||||
|
||||
from pylokinet.instance import main
|
||||
main()
|
|
@ -17,6 +17,7 @@ from pylokinet import rc
|
|||
lib_file = os.path.join(os.path.realpath('.'), 'liblokinet-shared.so')
|
||||
|
||||
|
||||
|
||||
def log(msg):
|
||||
sys.stderr.write("lokinet: {}\n".format(msg))
|
||||
sys.stderr.flush()
|
||||
|
@ -103,7 +104,7 @@ class LokiNET(threading.Thread):
|
|||
def getconf(name, fallback=None):
|
||||
return name in os.environ and os.environ[name] or fallback
|
||||
|
||||
def main(args):
|
||||
def run_main(args):
|
||||
log("going up")
|
||||
root = getconf("LOKINET_ROOT")
|
||||
if root is None:
|
||||
|
@ -120,6 +121,8 @@ def main(args):
|
|||
print("LOKINET_BOOTSTRAP_URL was not set")
|
||||
|
||||
lib = getconf("LOKINET_LIB", lib_file)
|
||||
if not os.path.exists(lib):
|
||||
lib = "liblokinet-shared.so"
|
||||
timeout = int(getconf("LOKINET_TIMEOUT", "5"))
|
||||
ping_interval = int(getconf("LOKINET_PING_INTERVAL", "60"))
|
||||
ping_callback = getconf("LOKINET_PING_URL")
|
||||
|
@ -191,5 +194,9 @@ def main(args):
|
|||
loki.close()
|
||||
else:
|
||||
loki.close()
|
||||
|
||||
main(sys.argv[1:])
|
||||
|
||||
def main():
|
||||
run_main(sys.argv[1:])
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
|
@ -24,4 +24,4 @@ run (root):
|
|||
# export LOKINET_IP=public.ip.goes.here
|
||||
# export LOKINET_PORT=1090
|
||||
# export LOKINET_IFNAME=eth0
|
||||
# python3 -m pylokinet.instance
|
||||
# python3 -m pylokinet
|
|
@ -1,10 +1,12 @@
|
|||
FROM debian:stable
|
||||
|
||||
RUN apt update && \
|
||||
apt install -y build-essential cmake git libcap-dev curl rapidjson-dev
|
||||
apt install -y build-essential cmake git libcap-dev curl rapidjson-dev python3-dev python3-setuptools libsodium-dev
|
||||
|
||||
WORKDIR /src/
|
||||
|
||||
COPY . /src/
|
||||
|
||||
RUN make -j 8 JSONRPC=ON && make install
|
||||
RUN make -j 8 SHARED_LIB=ON JSONRPC=ON && make kubernetes-install
|
||||
|
||||
ENTRYPOINT [ "/usr/bin/python3", "-m", "pylokinet"]
|
Loading…
Reference in New Issue