From 4b4eba867b5e01bfbd458978c0d1bd47d3fdd003 Mon Sep 17 00:00:00 2001 From: Brian Warner <warner@allmydata.com> Date: Tue, 5 Feb 2008 20:08:49 -0700 Subject: [PATCH] webish: display tahoe import path on the welcome page, to help figure out where the code is coming from --- src/allmydata/web/welcome.xhtml | 3 ++- src/allmydata/webish.py | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/allmydata/web/welcome.xhtml b/src/allmydata/web/welcome.xhtml index 48dbf9aa..8bafa39f 100644 --- a/src/allmydata/web/welcome.xhtml +++ b/src/allmydata/web/welcome.xhtml @@ -17,7 +17,8 @@ tool</a> may also be useful.</div> <h2>Grid Status</h2> <div>My nodeid: <span n:render="string" n:data="my_nodeid" /></div> -<div>My version: <span n:render="string" n:data="version" /></div> +<div>My versions: <span n:render="string" n:data="version" /></div> +<div>Tahoe code imported from: <span n:render="string" n:data="import_path" /></div> <div>Introducer: <span n:render="string" n:data="introducer_furl" /></div> <div>Connected to introducer?: <span n:render="string" n:data="connected_to_introducer" /></div> diff --git a/src/allmydata/webish.py b/src/allmydata/webish.py index 31ef7b47..d5de20cc 100644 --- a/src/allmydata/webish.py +++ b/src/allmydata/webish.py @@ -11,6 +11,7 @@ from allmydata.util import fileutil, idlib import simplejson from allmydata.interfaces import IDownloadTarget, IDirectoryNode, IFileNode, \ IMutableFileNode +import allmydata # to display import path from allmydata import download from allmydata.upload import FileHandle, FileName from allmydata import provisioning @@ -1311,6 +1312,8 @@ class Root(rend.Page): def data_version(self, ctx, data): return get_package_versions_string() + def data_import_path(self, ctx, data): + return str(allmydata) def data_my_nodeid(self, ctx, data): return idlib.nodeid_b2a(IClient(ctx).nodeid) -- 2.45.2