Mirroristas/planetmint
2
0
Fork 0
mirror of https://github.com/planetmint/planetmint.git synced 2025-11-25 15:05:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fixed_config' of github.com:liviu-lesan/planetmint into fixed_config

Browse Source
This commit is contained in:
andrei 2022-04-27 12:31:57 +03:00
commit cead415f01
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile-dev
View File

@ -4,6 +4,7 @@ LABEL maintainer "contact@ipdb.global"
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y git zsh\ && apt-get install -y git zsh\
&& apt-get install -y tarantool-common\
&& pip install -U pip \ && pip install -U pip \
&& apt-get autoremove \ && apt-get autoremove \
&& apt-get clean && apt-get clean
@ -15,7 +16,7 @@ ARG abci_status
# to force stdin, stdout and stderr to be totally unbuffered and to capture logs/outputs # to force stdin, stdout and stderr to be totally unbuffered and to capture logs/outputs
ENV PYTHONUNBUFFERED 0 ENV PYTHONUNBUFFERED 0
ENV PLANETMINT_DATABASE_PORT 27017 ENV PLANETMINT_DATABASE_PORT 3303
ENV PLANETMINT_DATABASE_BACKEND $backend ENV PLANETMINT_DATABASE_BACKEND $backend
ENV PLANETMINT_SERVER_BIND 0.0.0.0:9984 ENV PLANETMINT_SERVER_BIND 0.0.0.0:9984
ENV PLANETMINT_WSSERVER_HOST 0.0.0.0 ENV PLANETMINT_WSSERVER_HOST 0.0.0.0

2
planetmint/backend/tarantool/connection.py
View File

@ -63,7 +63,7 @@ class TarantoolDB:
import subprocess import subprocess
print(f" commands: {command}") print(f" commands: {command}")
ret = subprocess.Popen( ret = subprocess.Popen(
['%s %s:%s < %s' % ("tarantoolctl connect", "localhost", "3303", command)], ['%s %s:%s < %s' % ("tarantoolctl connect", self.host, self.port, command)],
stdin=subprocess.PIPE, stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
universal_newlines=True, universal_newlines=True,

5
tests/conftest.py
View File

@ -17,6 +17,7 @@ import tempfile
from collections import namedtuple from collections import namedtuple
from logging import getLogger from logging import getLogger
from logging.config import dictConfig from logging.config import dictConfig
from planetmint.backend.connection import Connection
import pytest import pytest
# from pymongo import MongoClient # from pymongo import MongoClient
@ -117,7 +118,7 @@ def _setup_database(_configure_planetmint): # TODO Here is located setup databa
print('Deleting `{}` database') print('Deleting `{}` database')
db_conn = TarantoolDB("localhost", 3303) db_conn = Connection()
db_conn.drop_database() db_conn.drop_database()
db_conn.init_database() db_conn.init_database()
print('Finished deleting ``') print('Finished deleting ``')
@ -126,7 +127,7 @@ def _setup_database(_configure_planetmint): # TODO Here is located setup databa
print('Initializing test db') print('Initializing test db')
db_conn2 = TarantoolDB("localhost", 3303) db_conn2 = Connection()
db_conn2.drop_database() db_conn2.drop_database()
print('Finishing init database') print('Finishing init database')