Make the log file generated by application daemon configurable in RPM based SystemV #656

fsat · 2015-08-31T08:12:20Z

Introduce a new settings key called rpmDaemonLogFile which will be used to configure
the name of the log file generated by application daemon in RPM based SystemV.

Make the default value of the rpmDaemonLogFile settings to be ${{app_name}}.log.

fsat · 2015-08-31T08:12:29Z

Fixes https://github.com/typesafehub/conductr/issues/793

muuki88 · 2015-08-31T15:51:02Z

#619 is related to this. If you could make this modifiable, then it could be configured for conductr and other things.

fsat · 2015-09-04T02:24:54Z

@muuki88 - I have made this configurable with daemon.log as the default value to match existing behaviour. Updated the PR title & description to match as well.

I'm not sure how I should update the documentation since this change impacts Redhat only, not all Linux.

huntc · 2015-09-04T05:33:29Z

src/main/scala/com/typesafe/sbt/packager/linux/Keys.scala

@@ -13,6 +13,7 @@ trait LinuxKeys {
  val daemonGroup = SettingKey[String]("daemon-group", "Group to start application daemon")
  val daemonGroupGid = SettingKey[Option[String]]("daemon-group-gid", "GID of daemonGroup")
  val daemonShell = SettingKey[String]("daemon-shell", "Shell provided for the daemon user")
+  val daemonLogFile = SettingKey[String]("daemon-log-file", "Name of the log file generated by the application daemon")


Should be an rpm only key

for what reason? Not sure if other packages/system start daemons may use this as well. debian systemv for example.

Felix and I spoke about this and concluded that it was only needed for rpm. You can't have this choice for Debian as the log is already named with the dpkg-ing and there is no ability to change it.

muuki88 · 2015-09-04T19:01:48Z

@huntc if you have no objections, feel free to merge.

huntc · 2015-09-05T02:54:10Z

Thanks @muuki88. I believe Felix has some more changes to push so no merge is required immediately.

fsat · 2015-09-07T00:49:52Z

@huntc & @muuki88 - I have created a rpm specific settings called rpmDaemonLogFile which has ${{app_name}}.log as the default value.

This settings will allow overriding the log file name generated by the application daemon in rpm based install.

I have performed manual test for this change using the test-project. I have tested both default rpmDaemonLogFile value and overriding rpmDaemonLogFile scenario successfully.

huntc · 2015-09-07T02:06:06Z

src/main/scala/com/typesafe/sbt/packager/rpm/Keys.scala

+    """|Replacements of template parameters used in linux rpm scripts.
+       |  Default supported templates:
+       |  rpmDaemonLogFile - name of the log file generated by application daemon
+    """.stripMargin


rpmScriptReplacements should be rpm-script-replacements

fsat · 2015-09-07T04:24:44Z

src/main/scala/com/typesafe/sbt/packager/rpm/RpmPlugin.scala

@@ -80,7 +80,11 @@ object RpmPlugin extends AutoPlugin {
    target in Rpm <<= target(_ / "rpm"),
    name in Rpm <<= name in Linux,
    packageName in Rpm <<= packageName in Linux,
-    executableScriptName in Rpm <<= executableScriptName in Linux
+    executableScriptName in Rpm <<= executableScriptName in Linux,
+    rpmDaemonLogFile := s"${(packageName in Linux).value}.log",


Quoting @huntc + cc @muuki88 as commit has been updated:

For consistency I recommend using the name as per Debian packaging, and not daemon.log, unless there is some Fedora style precedence for this. This change of ours was motivated by the fact that we came upon daemon.log unexpectedly.

@muuki88 WDYT?

muuki88 · 2015-09-07T18:36:20Z

src/main/scala/com/typesafe/sbt/packager/rpm/Keys.scala

@@ -60,4 +60,15 @@ trait RpmKeys {
  // Building
  val rpmLint = TaskKey[Unit]("rpm-lint", "Runs rpmlint program against the genreated RPM, if available.")

+  val rpmDaemonLogFile = SettingKey[String]("rpm-daemon-log-file", "Name of the log file generated by application daemon")
+
+  val rpmScriptReplacements = SettingKey[Seq[(String, String)]](


Why introduce this new setting? linuxScriptReplacements in Rpm should be sufficient?

I understand that rpmScriptReplacements is declared here because it is specific to RPM i.e. it isn't a script replacement destined for Linux.

If there was a key named just scriptReplacements then that'd be different...

Make sense @muuki88 ?

yes, that makes sense @huntc and I like the idea for a general purpose setting scriptReplacements and scoping it to the different configurations. This will be easier if there were less settings ;)

IMHO we should not introduce a new key as removing these is much harder.

… based SystemV Introduce a new settings key called `rpmDaemonLogFile` which will be used to configure the name of the log file generated by application daemon in RPM based SystemV. Make the default value of the `rpmDaemonLogFile` settings to be `${{app_name}}.log`.

fsat · 2015-09-09T03:38:28Z

@muuki88 & @huntc - changes implemented, please review.

huntc · 2015-09-09T03:43:10Z

LGTM

Make the log file generated by application daemon configurable in RPM based SystemV

fsat changed the title ~~Name the log file based on the application name instead of daemon.log in RPM based SystemV~~ WIP - DON'T MERGE - Name the log file based on the application name instead of daemon.log in RPM based SystemV Aug 31, 2015

muuki88 added the rpm label Aug 31, 2015

fsat force-pushed the rpm-systemv-log-name branch from 62cd310 to e79ffc8 Compare September 4, 2015 02:22

fsat changed the title ~~WIP - DON'T MERGE - Name the log file based on the application name instead of daemon.log in RPM based SystemV~~ WIP - DON'T MERGE - Make the log file generated by application daemon configurable in RPM based SystemV Sep 4, 2015

huntc reviewed Sep 4, 2015
View reviewed changes

fsat force-pushed the rpm-systemv-log-name branch 3 times, most recently from 8784294 to 2c6b4cc Compare September 7, 2015 00:44

fsat changed the title ~~WIP - DON'T MERGE - Make the log file generated by application daemon configurable in RPM based SystemV~~ Make the log file generated by application daemon configurable in RPM based SystemV Sep 7, 2015

fsat force-pushed the rpm-systemv-log-name branch from 2c6b4cc to 9527777 Compare September 7, 2015 00:54

huntc reviewed Sep 7, 2015
View reviewed changes

fsat changed the title ~~Make the log file generated by application daemon configurable in RPM based SystemV~~ WIP - DON'T MERGE - Make the log file generated by application daemon configurable in RPM based SystemV Sep 7, 2015

fsat force-pushed the rpm-systemv-log-name branch 2 times, most recently from 821ed3e to f387d55 Compare September 7, 2015 04:22

fsat reviewed Sep 7, 2015
View reviewed changes

fsat changed the title ~~WIP - DON'T MERGE - Make the log file generated by application daemon configurable in RPM based SystemV~~ Make the log file generated by application daemon configurable in RPM based SystemV Sep 7, 2015

muuki88 reviewed Sep 7, 2015
View reviewed changes

fsat force-pushed the rpm-systemv-log-name branch from f387d55 to 6c07b85 Compare September 9, 2015 01:59

muuki88 added a commit that referenced this pull request Sep 9, 2015

Merge pull request #656 from fsat/rpm-systemv-log-name

334416e

Make the log file generated by application daemon configurable in RPM based SystemV

muuki88 merged commit 334416e into sbt:master Sep 9, 2015

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make the log file generated by application daemon configurable in RPM based SystemV #656

Make the log file generated by application daemon configurable in RPM based SystemV #656

fsat commented Aug 31, 2015

fsat commented Aug 31, 2015

muuki88 commented Aug 31, 2015

fsat commented Sep 4, 2015

huntc Sep 4, 2015

muuki88 Sep 4, 2015

huntc Sep 5, 2015

muuki88 commented Sep 4, 2015

huntc commented Sep 5, 2015

fsat commented Sep 7, 2015

huntc Sep 7, 2015

fsat Sep 7, 2015

muuki88 Sep 7, 2015

huntc Sep 8, 2015

muuki88 Sep 8, 2015

fsat commented Sep 9, 2015

huntc commented Sep 9, 2015

Make the log file generated by application daemon configurable in RPM based SystemV #656

Make the log file generated by application daemon configurable in RPM based SystemV #656

Conversation

fsat commented Aug 31, 2015

fsat commented Aug 31, 2015

muuki88 commented Aug 31, 2015

fsat commented Sep 4, 2015

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

muuki88 commented Sep 4, 2015

huntc commented Sep 5, 2015

fsat commented Sep 7, 2015

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fsat commented Sep 9, 2015

huntc commented Sep 9, 2015