From 57997174f4f2985524934e70fe9d3444f3e7a207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kurk=C3=B3=20Mih=C3=A1ly?= Date: Fri, 12 Jan 2018 18:00:08 +0200 Subject: [PATCH] dashboard: limit commit length on client side --- dashboard/assets/components/Footer.jsx | 2 +- dashboard/dashboard.go | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dashboard/assets/components/Footer.jsx b/dashboard/assets/components/Footer.jsx index bb7d777831..7130b4e4e5 100644 --- a/dashboard/assets/components/Footer.jsx +++ b/dashboard/assets/components/Footer.jsx @@ -62,7 +62,7 @@ class Footer extends Component { render() { const {classes, general} = this.props; // The classes property is injected by withStyles(). const geth = general.version ? this.info('Geth', general.version) : null; - const commit = general.commit ? this.info('Commit', general.commit) : null; + const commit = general.commit ? this.info('Commit', general.commit.substring(0, 7)) : null; return ( diff --git a/dashboard/dashboard.go b/dashboard/dashboard.go index d763fd5dc2..2ac2652ee9 100644 --- a/dashboard/dashboard.go +++ b/dashboard/dashboard.go @@ -208,15 +208,11 @@ func (db *Dashboard) apiHandler(conn *websocket.Conn) { if len(params.VersionMeta) > 0 { versionMeta = fmt.Sprintf(" (%s)", params.VersionMeta) } - commit := db.commit - if len(commit) > 7 { - commit = commit[:7] - } // Send the past data. client.msg <- Message{ General: &GeneralMessage{ Version: fmt.Sprintf("v%d.%d.%d%s", params.VersionMajor, params.VersionMinor, params.VersionPatch, versionMeta), - Commit: commit, + Commit: db.commit, }, Home: &HomeMessage{ Memory: db.charts.Memory,