clarified errors: PHP daemon can fail under odd circumstances;
authorwenzelm
Thu, 14 Nov 2019 16:07:34 +0100
changeset 71128 f79006c533b0
parent 71127 0ad53b5f2bb1
child 71129 557703db74c3
clarified errors: PHP daemon can fail under odd circumstances;
src/Pure/Tools/phabricator.scala
--- a/src/Pure/Tools/phabricator.scala	Thu Nov 14 14:03:42 2019 +0100
+++ b/src/Pure/Tools/phabricator.scala	Thu Nov 14 16:07:34 2019 +0100
@@ -354,10 +354,12 @@
 
     Linux.service_restart("apache2")
 
+    progress.echo("\nWeb configuration via " + server_url)
+
 
     /* PHP daemon */
 
-    progress.echo("PHP daemon setup ...")
+    progress.echo("\nPHP daemon setup ...")
 
     config.execute("config set phd.user " + Bash.string(daemon_user))
     config.execute("config set phd.log-directory /var/tmp/phd/" +
@@ -373,7 +375,8 @@
     Isabelle_System.chmod("755", phd_command)
     Isabelle_System.chown("root:root", phd_command)
 
-    Linux.service_install(phd_name,
+    try {
+      Linux.service_install(phd_name,
 """[Unit]
 Description=PHP daemon manager for Isabelle/Phabricator
 After=syslog.target network.target apache2.service mysql.service
@@ -390,9 +393,12 @@
 [Install]
 WantedBy=multi-user.target
 """)
-
-
-    progress.echo("\nDONE\nWeb configuration via " + server_url)
+    }
+    catch {
+      case ERROR(msg) =>
+        progress.bash("bin/phd status", cwd = config.home.file, echo = true).check
+        error(msg)
+    }
   }