Skip to content
This repository has been archived by the owner on Aug 19, 2024. It is now read-only.

Commit

Permalink
Merge pull request #36 from qstokkink/various_fixes
Browse files Browse the repository at this point in the history
Various fixes
  • Loading branch information
qstokkink authored Apr 29, 2024
2 parents adb9a2c + e6d25c9 commit 87565cd
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/unittests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
path: libsodium.dll
key: cache_libsodium_dll
macos:
runs-on: macos-latest
runs-on: macos-12
timeout-minutes: 2
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion src/run_tribler.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def main() -> None:
asyncio.set_event_loop(asyncio.SelectorEventLoop())

parsed_args = parse_args()
logging.basicConfig(level=getattr(logging, parsed_args["log_level"]), stream=sys.stdout)
logging.basicConfig(level=parsed_args["log_level"], stream=sys.stdout)
logger.info("Run Tribler: %s", parsed_args)

root_state_dir = get_root_state_directory(os.environ.get('TSTATEDIR', 'state_directory'))
Expand Down
2 changes: 1 addition & 1 deletion src/tribler/core/components.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ def finalize(self, ipv8: IPv8, session: Session, community: Community) -> None:
@after("DatabaseComponent")
@precondition('session.config.get("rendezvous/enabled")')
@overlay("tribler.core.rendezvous.community", "RendezvousCommunity")
class RendezvousComponent(CommunityLauncher):
class RendezvousComponent(BaseLauncher):

def get_kwargs(self, session: object) -> dict:
from tribler.core.rendezvous.database import RendezvousDatabase
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -354,8 +354,10 @@ def set_proxy_settings(self, ltsession: lt.session, ptype: int, server: tuple[st
settings["proxy_hostnames"] = True
settings["proxy_peer_connections"] = True
if server is not None:
settings["proxy_hostname"] = server[0]
settings["proxy_port"] = int(server[1])
proxy_host = server[0]
if proxy_host:
settings["proxy_hostname"] = proxy_host
settings["proxy_port"] = int(server[1]) if server[1] else 0
if auth is not None:
settings["proxy_username"] = auth[0]
settings["proxy_password"] = auth[1]
Expand Down

0 comments on commit 87565cd

Please sign in to comment.