Retrieve operator & HO log via http api endpoint, without journald

Author: 0405ysj

frontend/debian/cuttlefish-orchestration.cuttlefish-host_orchestrator.init

@@ -41,6 +41,7 @@ USER="httpcvd"
 RUN_DIR="/run/cuttlefish"
 ORCHESTRATOR_BIN="/usr/lib/cuttlefish-common/bin/host_orchestrator"
 ORCHESTRATOR_PIDFILE="${RUN_DIR}"/host_orchestrator.pid
+ORCHESTRATOR_LOGFILE="${RUN_DIR}"/host_orchestrator.log
 ASSET_DIR="/usr/share/cuttlefish-common/operator"
 
 set_config_expr() {
@@ -102,6 +103,7 @@ start_orchestrator() {
     --chdir "${ASSET_DIR}" \
     --background --no-close \
     --make-pidfile \
+    --output ${ORCHESTRATOR_LOGFILE} \
     --exec "${ORCHESTRATOR_BIN}" -- "${args[@]}"
 }
 

frontend/debian/cuttlefish-user.cuttlefish-operator.init

@@ -39,6 +39,7 @@ RUN_DIR="/run/cuttlefish"
 ASSET_DIR="/usr/share/cuttlefish-common/operator"
 DAEMON="/usr/lib/cuttlefish-common/bin/operator"
 PIDFILE="${RUN_DIR}"/operator.pid
+LOGFILE="${RUN_DIR}"/operator.log
 
 gen_cert() {
   operator_tls_cert_dir=${operator_tls_cert_dir:-/etc/cuttlefish-common/operator/cert}
@@ -92,6 +93,7 @@ start() {
     --chdir "${ASSET_DIR}" \
     --background --no-close \
     --make-pidfile \
+    --output ${LOGFILE} \
     --exec "${DAEMON}" -- "${args[@]}"
 }
 

frontend/host/packages/cuttlefish-orchestration/etc/nginx/sites-available/cuttlefish-orchestration.conf

@@ -29,13 +29,13 @@ server {
     ssl_certificate /etc/cuttlefish-orchestration/ssl/cert/cert.pem;
     ssl_certificate_key /etc/cuttlefish-orchestration/ssl/cert/key.pem;
 
-   location /hostlogs/cuttlefish-operator.service {
-       rewrite /hostlogs/cuttlefish-operator.service /entries?_SYSTEMD_UNIT=cuttlefish-operator.service break;
-       proxy_pass http://0.0.0.0:19531;
+   location = /hostlogs/cuttlefish-operator.service {
+       alias /run/cuttlefish/operator.log;
+       default_type "text/plain";
    }
-   location /hostlogs/cuttlefish-host_orchestrator.service {
-       rewrite /hostlogs/cuttlefish-host_orchestrator.service /entries?_SYSTEMD_UNIT=cuttlefish-host_orchestrator.service break;
-       proxy_pass http://0.0.0.0:19531;
+   location = /hostlogs/cuttlefish-host_orchestrator.service {
+       alias /run/cuttlefish/host_orchestrator.log;
+       default_type "text/plain";
    }
    location /hostlogs/kernel {
        rewrite /hostlogs/kernel /entries?_TRANSPORT=kernel break;