Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-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 CFC1D17725 for ; Thu, 5 Mar 2015 14:57:33 +0000 (UTC) Received: (qmail 10726 invoked by uid 500); 5 Mar 2015 14:57:33 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 10700 invoked by uid 500); 5 Mar 2015 14:57:33 -0000 Mailing-List: contact commits-help@brooklyn.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.incubator.apache.org Delivered-To: mailing list commits@brooklyn.incubator.apache.org Received: (qmail 10687 invoked by uid 99); 5 Mar 2015 14:57:33 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Mar 2015 14:57:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 05 Mar 2015 14:57:32 +0000 Received: (qmail 10564 invoked by uid 99); 5 Mar 2015 14:57:12 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Mar 2015 14:57:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 02D09E03B0; Thu, 5 Mar 2015 14:57:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aledsage@apache.org To: commits@brooklyn.incubator.apache.org Date: Thu, 05 Mar 2015 14:57:12 -0000 Message-Id: <6334c8c9370847ce9170ece46eb8a4b9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/4] incubator-brooklyn git commit: Mysql template upload: ensure tmp file is deleted X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-brooklyn Updated Branches: refs/heads/master dfdc68703 -> 2066ea95f Mysql template upload: ensure tmp file is deleted Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/817b820b Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/817b820b Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/817b820b Branch: refs/heads/master Commit: 817b820b6fd6fd6f3bfda2afdb8f9e82c5dfa66b Parents: 119d894 Author: Aled Sage Authored: Tue Mar 3 15:57:32 2015 +0000 Committer: Aled Sage Committed: Tue Mar 3 15:57:32 2015 +0000 ---------------------------------------------------------------------- .../entity/database/mysql/MySqlSshDriver.java | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/817b820b/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlSshDriver.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlSshDriver.java b/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlSshDriver.java index a4e28d5..fb13175 100644 --- a/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlSshDriver.java +++ b/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlSshDriver.java @@ -25,10 +25,8 @@ import static java.lang.String.format; import java.io.BufferedWriter; import java.io.File; -import java.io.FileOutputStream; import java.io.FileWriter; import java.io.IOException; -import java.io.InputStream; import java.io.Reader; import java.io.StringReader; import java.util.LinkedList; @@ -48,9 +46,11 @@ import brooklyn.location.basic.BasicOsDetails.OsVersions; import brooklyn.location.basic.SshMachineLocation; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; +import brooklyn.util.io.FileUtil; import brooklyn.util.net.Urls; import brooklyn.util.os.Os; import brooklyn.util.ssh.BashCommands; +import brooklyn.util.stream.Streams; import brooklyn.util.task.DynamicTasks; import brooklyn.util.task.system.ProcessTaskWrapper; import brooklyn.util.text.ComparableVersion; @@ -195,17 +195,21 @@ public class MySqlSshDriver extends AbstractSoftwareProcessSshDriver implements String creationScriptContents = DatastoreMixins.getDatabaseCreationScriptAsString(entity); if (creationScriptContents==null) return false; - File templateFile; + File templateFile = null; + BufferedWriter writer = null; try { templateFile = File.createTempFile("mysql", null); - templateFile.deleteOnExit(); - BufferedWriter writer = new BufferedWriter(new FileWriter(templateFile)); - writer.write (creationScriptContents); + FileUtil.setFilePermissionsTo600(templateFile); + writer = new BufferedWriter(new FileWriter(templateFile)); + writer.write(creationScriptContents); + writer.flush(); + copyTemplate(templateFile.getAbsoluteFile(), getRunDir() + "/creation-script.sql"); } catch (IOException e) { throw Exceptions.propagate(e); + } finally { + if (writer != null) Streams.closeQuietly(writer); + if (templateFile != null) templateFile.delete(); } - copyTemplate(templateFile.getAbsoluteFile(), getRunDir() + "/creation-script.sql"); - templateFile.delete(); return true; }