Skip to content
Snippets Groups Projects

Create and install a BridgeDescMgr when we bootstrap

Merged Ian Jackson requested to merge Diziet/arti:bdm-plumb into main
2 unresolved threads

Fixes #631 (closed).

Merge request reports

Merged by Ian JacksonIan Jackson 2 years ago (Nov 15, 2022 1:01pm UTC)

Merge details

  • Changes merged into main with 88caacfb.
  • Deleted the source branch.
  • Auto-merge enabled

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
97 97 should_bootstrap: BootstrapBehavior,
98 98
99 99 /// Shared boolean for whether we're currently in "dormant mode" or not.
100 dormant: Arc<Mutex<DropNotifyWatchSender<Option<DormantMode>>>>,
100 dormant: Arc<Mutex<DropNotifyWatchSender<DormantMode>>>,
  • Ian Jackson added 3 commits

    added 3 commits

    • da2c4b60 - Revert "arti_client: dormancy: Remove a pointless Option"
    • e8b73670 - fixup! bridges: Create and install a BridgeDescMgr when we bootstrap
    • c41c3d60 - fixup! bridges: Create and install a BridgeDescMgr when we bootstrap

    Compare with previous version

  • Ian Jackson marked this merge request as draft from Diziet/arti@e8b73670

    marked this merge request as draft from Diziet/arti@e8b73670

  • mentioned in commit Diziet/arti@1042f9ae

  • Ian Jackson mentioned in merge request !853 (merged)

    mentioned in merge request !853 (merged)

  • Author Maintainer

    I hope I have fixed the CI too.

  • Looks good, except please also add a comment to explain why DormantMode has to be in an Option<·>. After that feel free to squash and merge.

  • mentioned in commit Diziet/arti@4fd1b732

  • Author Maintainer

    I've proposed a way to avoid this Option bug being possible in !853 (merged), and added a comment there: !853 (4fd1b732)

  • Ian Jackson added 11 commits

    added 11 commits

    • c41c3d60...79a09ae3 - 5 commits from branch tpo/core:main
    • 76ed10ef - arti_client: dormancy: Remove a pointless Option
    • 9475d7f5 - arti-client: Store a handle to the guardmgr in TorClient
    • c76ee47b - arti-client: Store a handle to the DirMgrStore in TorClient
    • 528ae180 - arti-client: Store a handle to the DirMgrStore in TorClient (fmt)
    • a4a738c0 - bridges: Create and install a BridgeDescMgr when we bootstrap
    • 99093759 - Revert "arti_client: dormancy: Remove a pointless Option"

    Compare with previous version

  • Ian Jackson added 4 commits

    added 4 commits

    • 647610f2 - arti-client: Store a handle to the guardmgr in TorClient
    • 63c46394 - arti-client: Store a handle to the DirMgrStore in TorClient
    • a565e338 - arti-client: Store a handle to the DirMgrStore in TorClient (fmt)
    • b7441c98 - bridges: Create and install a BridgeDescMgr when we bootstrap

    Compare with previous version

  • Ian Jackson marked this merge request as ready

    marked this merge request as ready

  • Ian Jackson enabled an automatic merge when the pipeline for b7441c98 succeeds

    enabled an automatic merge when the pipeline for b7441c98 succeeds

  • CI failure was docker related; I've hit "retry".

  • merged

  • Ian Jackson mentioned in commit 88caacfb

    mentioned in commit 88caacfb

  • mentioned in commit Diziet/arti@de0c12df

  • mentioned in commit Diziet/arti@ddd48c50

  • mentioned in commit Diziet/arti@c82cda85

  • mentioned in commit Diziet/arti@4d502bd8

  • Please register or sign in to reply
    Loading