+
${statsHTML(observer, statusClass)}
- ${statusClass === 'stale' && !observer.revoked ? `` : ''}
- ${observer.revoked ? '' : ``}
- ${observer.revoked ? '' : ``}
+ ${statusClass === 'stale' && !observer.revoked ? `` : ''}
+ ${observer.revoked ? '' : ``}
+ ${observer.revoked ? '' : ``}
`;
diff --git a/solstone/convey/root.py b/solstone/convey/root.py
index e594fbbd2..334ebafa1 100644
--- a/solstone/convey/root.py
+++ b/solstone/convey/root.py
@@ -110,7 +110,6 @@ def require_login() -> Any:
"app:observer.ingest_upload",
"app:observer.ingest_event",
"app:observer.ingest_segments",
- "app:observer.ingest_transfer",
"app:observer.ingest_manifest",
"app:observer.ingest_manifest_day",
"app:observer.register",
diff --git a/solstone/observe/transfer.py b/solstone/observe/transfer.py
index 5c301b997..e4ea517b9 100644
--- a/solstone/observe/transfer.py
+++ b/solstone/observe/transfer.py
@@ -9,12 +9,9 @@ observation segments between solstone instances.
Usage:
journal transfer export --day YYYYMMDD [--output PATH]
journal transfer import --archive PATH [--dry-run]
- journal transfer send --to URL --key KEY [--day YYYYMMDD] [--dry-run]
journal transfer send --to LABEL [--day YYYYMMDD] [--dry-run]
-On the RECEIVING host (the machine you are sending TO), run
-`journal observer create
` to generate an observer API key, then pass it
-as `--key`.
+Use `journal transfer send --to LABEL` to send segments to a paired peer.
"""
from __future__ import annotations
@@ -33,9 +30,6 @@ from datetime import datetime, timedelta
from pathlib import Path
from typing import Any
-import requests
-
-from solstone.observe import protocol
from solstone.observe.peer_lookup import PeerInfo, PeerLookupError, resolve_peer
from solstone.observe.pl_http import PlHttpSession
from solstone.think.callosum import callosum_send
@@ -56,16 +50,6 @@ from solstone.think.utils import (
from .utils import compute_file_sha256, find_available_segment
-OBSERVER_KEY_HINT = (
- "On the RECEIVING host (the machine you are sending TO), run "
- "`journal observer create ` to generate an observer API key, then "
- "pass it as `--key`."
-)
-
-AUTH_INVALID_OBSERVER_KEY = (
- "Authentication failed: invalid or missing observer API key. " + OBSERVER_KEY_HINT
-)
-
logger = logging.getLogger(__name__)
# Archive manifest version
@@ -448,26 +432,12 @@ def _normalize_url(to: str) -> str:
return f"https://{to}"
-def _is_url_destination(to: str) -> bool:
- return to.startswith(("http://", "https://"))
-
-
def _resolve_destination(
parser: argparse.ArgumentParser,
to: str,
- key: str | None,
-) -> tuple[str, str | None, PeerInfo | None]:
- if _is_url_destination(to):
- if key is None:
- parser.error("'--to ' requires '--key '")
- return ("dl", _normalize_url(to), None)
- if key is not None:
- parser.error(
- "'--key' is only valid with '--to '; "
- "use '--to