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

add context to phonehome stats #5020

Merged
merged 2 commits into from
Apr 8, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions changelog.d/5020.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add context to phonehome stats.
3 changes: 3 additions & 0 deletions docs/sample_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,9 @@ listeners:
# - medium: 'email'
# address: 'reserved_user@example.com'

# Used by phonehome stats to group together related servers.
#server_context: context


## TLS ##

Expand Down
2 changes: 1 addition & 1 deletion synapse/app/homeserver.py
Original file line number Diff line number Diff line change
Expand Up @@ -518,6 +518,7 @@ def phone_stats_home():
uptime = 0

stats["homeserver"] = hs.config.server_name
stats["server_context"] = hs.config.server_context
stats["timestamp"] = now
stats["uptime_seconds"] = uptime
version = sys.version_info
Expand Down Expand Up @@ -558,7 +559,6 @@ def phone_stats_home():

stats["database_engine"] = hs.get_datastore().database_engine_name
stats["database_server_version"] = hs.get_datastore().get_server_version()

logger.info("Reporting stats to matrix.org: %s" % (stats,))
try:
yield hs.get_simple_http_client().put_json(
Expand Down
4 changes: 4 additions & 0 deletions synapse/config/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ class ServerConfig(Config):

def read_config(self, config):
self.server_name = config["server_name"]
self.server_context = config.get("server_context", None)

try:
parse_and_validate_server_name(self.server_name)
Expand Down Expand Up @@ -484,6 +485,9 @@ def default_config(self, server_name, data_dir_path, **kwargs):
#mau_limit_reserved_threepids:
# - medium: 'email'
# address: 'reserved_user@example.com'

# Used by phonehome stats to group together related servers.
#server_context: context
""" % locals()

def read_arguments(self, args):
Expand Down