Skip to content
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

Jump to bottom

delete proxy useless parameter #114

Merged
merged 1 commit into from
Sep 28, 2020
Merged

delete proxy useless parameter #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 2 additions & 8 deletions maro/communication/proxy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
from enum import Enum
import itertools
import json
import random
import sys
import string
import signal
import time
from typing import List, Tuple, Dict, Union
Expand All @@ -31,7 +29,6 @@
PORT = default_parameters.proxy.redis.port
MAX_RETRIES = default_parameters.proxy.redis.max_retries
BASE_RETRY_INTERVAL = default_parameters.proxy.redis.base_retry_interval
SUFFIX_LENGTH = default_parameters.proxy.suffix_length
FAULT_TOLERANT = default_parameters.proxy.fault_tolerant
DELAY_FOR_SLOW_JOINER = default_parameters.proxy.delay_for_slow_joiner

Expand All @@ -52,15 +49,14 @@ class Proxy:
redis_address (Tuple): Hostname and port of the Redis server,
max_retries (int): Maximum number of retries before raising an exception,
base_retry_interval (float = 0.1): The time interval between attempts,
suffix_length (int = 6): The suffix length,
fault_tolerant (bool): Proxy can tolerate sending message error or not, default is False,
log_enable (bool): Open logger or not, default is True.
"""

def __init__(self, group_name: str, component_type: str, expected_peers: dict,
driver_type: DriverType = DriverType.ZMQ, driver_parameters: dict = None,
redis_address=(HOST, PORT), max_retries: int = MAX_RETRIES,
base_retry_interval: float = BASE_RETRY_INTERVAL, suffix_length: int = SUFFIX_LENGTH,
base_retry_interval: float = BASE_RETRY_INTERVAL,
fault_tolerant: bool = FAULT_TOLERANT, log_enable: bool = True):
self._group_name = group_name
self._component_type = component_type
Expand All @@ -71,9 +67,9 @@ def __init__(self, group_name: str, component_type: str, expected_peers: dict,
self._driver_parameters = driver_parameters
self._max_retries = max_retries
self._retry_interval = base_retry_interval
self._suffix_length = suffix_length
self._is_enable_fault_tolerant = fault_tolerant
self._log_enable = log_enable
self._logger = InternalLogger(component_name=self._name) if self._log_enable else DummyLogger()

try:
self._redis_connection = redis.Redis(host=redis_address[0], port=redis_address[1])
Expand All @@ -87,8 +83,6 @@ def __init__(self, group_name: str, component_type: str, expected_peers: dict,
self._onboard_peers_name_dict = {}
self._message_cache = defaultdict(list)

self._logger = InternalLogger(component_name=self._name) if self._log_enable else DummyLogger()

self._join()

def _signal_handler(self, signum, frame):
Expand Down
1 change: 0 additions & 1 deletion maro/communication/utils/default_parameters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@


proxy = convert_dottable({
"suffix_length": 6,
"fault_tolerant": False,
"delay_for_slow_joiner": 3,
"redis": {
Expand Down