Return-Path: X-Original-To: apmail-flink-commits-archive@minotaur.apache.org Delivered-To: apmail-flink-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1F2CE17AEB for ; Wed, 14 Jan 2015 09:40:42 +0000 (UTC) Received: (qmail 31332 invoked by uid 500); 14 Jan 2015 09:40:43 -0000 Delivered-To: apmail-flink-commits-archive@flink.apache.org Received: (qmail 31300 invoked by uid 500); 14 Jan 2015 09:40:43 -0000 Mailing-List: contact commits-help@flink.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flink.apache.org Delivered-To: mailing list commits@flink.apache.org Received: (qmail 31281 invoked by uid 99); 14 Jan 2015 09:40:43 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Jan 2015 09:40:43 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8BCB9A22D09; Wed, 14 Jan 2015 09:40:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rmetzger@apache.org To: commits@flink.apache.org Message-Id: <84bface8a029480cac6bd65953e6d22e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: flink git commit: [FLINK-1397] Fix logfile access from JobManager web interface Date: Wed, 14 Jan 2015 09:40:43 +0000 (UTC) Repository: flink Updated Branches: refs/heads/release-0.8 b4e9db091 -> f97a994fc [FLINK-1397] Fix logfile access from JobManager web interface Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/f97a994f Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/f97a994f Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/f97a994f Branch: refs/heads/release-0.8 Commit: f97a994fcac5450e2a36672e96e98c693f7e13e0 Parents: b4e9db0 Author: Robert Metzger Authored: Tue Jan 13 21:55:00 2015 +0100 Committer: Robert Metzger Committed: Wed Jan 14 10:39:25 2015 +0100 ---------------------------------------------------------------------- .../apache/flink/runtime/jobmanager/web/LogfileInfoServlet.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/f97a994f/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/LogfileInfoServlet.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/LogfileInfoServlet.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/LogfileInfoServlet.java index 7e64993..05f3ed9 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/LogfileInfoServlet.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/LogfileInfoServlet.java @@ -58,11 +58,11 @@ public class LogfileInfoServlet extends HttpServlet { try { if("stdout".equals(req.getParameter("get"))) { // Find current stdout file - sendFile(".*-jobmanager-[^\\.]*\\.out", resp); + sendFile(".*jobmanager-[^\\.]*\\.out", resp); } else { // Find current logfile - sendFile(".*-jobmanager-[^\\.]*\\.log", resp); + sendFile(".*jobmanager-[^\\.]*\\.log", resp); } } catch (Throwable t) { resp.setStatus(HttpServletResponse.SC_BAD_REQUEST);