Browse code

clean up screen and tail_log references

Change-Id: I6bcfa09931ed1f70e071ccb16688c15c7ef2898f

Sean Dague authored on 2017/08/31 03:16:58
Showing 10 changed files
... ...
@@ -473,7 +473,7 @@ function _configure_tgt_for_config_d {
473 473
     fi
474 474
 }
475 475
 
476
-# start_cinder() - Start running processes, including screen
476
+# start_cinder() - Start running processes
477 477
 function start_cinder {
478 478
     local service_port=$CINDER_SERVICE_PORT
479 479
     local service_protocol=$CINDER_SERVICE_PROTOCOL
... ...
@@ -533,12 +533,9 @@ function start_cinder {
533 533
 # stop_cinder() - Stop running processes
534 534
 function stop_cinder {
535 535
     stop_process c-api
536
-
537
-    # Kill the cinder screen windows
538
-    local serv
539
-    for serv in c-bak c-sch c-vol; do
540
-        stop_process $serv
541
-    done
536
+    stop_process c-bak
537
+    stop_process c-sch
538
+    stop_process c-vol
542 539
 }
543 540
 
544 541
 # create_volume_types() - Create Cinder's configured volume types
... ...
@@ -16,7 +16,7 @@
16 16
 _XTRACE_DSTAT=$(set +o | grep xtrace)
17 17
 set +o xtrace
18 18
 
19
-# start_dstat() - Start running processes, including screen
19
+# start_dstat() - Start running processes
20 20
 function start_dstat {
21 21
     # A better kind of sysstat, with the top process per time slice
22 22
     run_process dstat "$TOP_DIR/tools/dstat.sh $LOGDIR"
... ...
@@ -333,7 +333,7 @@ function install_glance {
333 333
     setup_develop $GLANCE_DIR
334 334
 }
335 335
 
336
-# start_glance() - Start running processes, including screen
336
+# start_glance() - Start running processes
337 337
 function start_glance {
338 338
     local service_protocol=$GLANCE_SERVICE_PROTOCOL
339 339
     if is_service_enabled tls-proxy; then
... ...
@@ -358,7 +358,6 @@ function start_glance {
358 358
 
359 359
 # stop_glance() - Stop running processes
360 360
 function stop_glance {
361
-    # Kill the Glance screen windows
362 361
     stop_process g-api
363 362
     stop_process g-reg
364 363
 }
... ...
@@ -181,13 +181,12 @@ function install_horizon {
181 181
     git_clone $HORIZON_REPO $HORIZON_DIR $HORIZON_BRANCH
182 182
 }
183 183
 
184
-# start_horizon() - Start running processes, including screen
184
+# start_horizon() - Start running processes
185 185
 function start_horizon {
186 186
     restart_apache_server
187
-    tail_log horizon /var/log/$APACHE_NAME/horizon_error.log
188 187
 }
189 188
 
190
-# stop_horizon() - Stop running processes (non-screen)
189
+# stop_horizon() - Stop running processes
191 190
 function stop_horizon {
192 191
     stop_apache_server
193 192
 }
... ...
@@ -536,7 +536,7 @@ function install_keystone {
536 536
     fi
537 537
 }
538 538
 
539
-# start_keystone() - Start running processes, including screen
539
+# start_keystone() - Start running processes
540 540
 function start_keystone {
541 541
     # Get right service port for testing
542 542
     local service_port=$KEYSTONE_SERVICE_PORT
... ...
@@ -549,8 +549,6 @@ function start_keystone {
549 549
     if [ "$KEYSTONE_DEPLOY" == "mod_wsgi" ]; then
550 550
         enable_apache_site keystone
551 551
         restart_apache_server
552
-        tail_log key /var/log/$APACHE_NAME/keystone.log
553
-        tail_log key-access /var/log/$APACHE_NAME/keystone_access.log
554 552
     else # uwsgi
555 553
         run_process keystone "$KEYSTONE_BIN_DIR/uwsgi --ini $KEYSTONE_PUBLIC_UWSGI_CONF" ""
556 554
     fi
... ...
@@ -585,8 +583,6 @@ function stop_keystone {
585 585
     else
586 586
         stop_process keystone
587 587
     fi
588
-    # Kill the Keystone screen window
589
-    stop_process key
590 588
 }
591 589
 
592 590
 # bootstrap_keystone() - Initialize user, role and project
... ...
@@ -409,7 +409,7 @@ function start_neutron_api {
409 409
     fi
410 410
 }
411 411
 
412
-# start_neutron() - Start running processes, including screen
412
+# start_neutron() - Start running processes
413 413
 function start_neutron_new {
414 414
     # Start up the neutron agents if enabled
415 415
     # TODO(sc68cal) Make this pluggable so different DevStack plugins for different Neutron plugins
... ...
@@ -446,7 +446,7 @@ function start_neutron_new {
446 446
     fi
447 447
 }
448 448
 
449
-# stop_neutron() - Stop running processes (non-screen)
449
+# stop_neutron() - Stop running processes
450 450
 function stop_neutron_new {
451 451
     for serv in neutron-api neutron-agent neutron-l3; do
452 452
         stop_process $serv
... ...
@@ -455,7 +455,7 @@ function configure_neutron_after_post_config {
455 455
     fi
456 456
 }
457 457
 
458
-# Start running processes, including screen
458
+# Start running processes
459 459
 function start_neutron_service_and_check {
460 460
     local service_port=$Q_PORT
461 461
     local service_protocol=$Q_PROTOCOL
... ...
@@ -524,7 +524,7 @@ function stop_mutnauq_l2_agent {
524 524
     stop_process q-agt
525 525
 }
526 526
 
527
-# stop_mutnauq_other() - Stop running processes (non-screen)
527
+# stop_mutnauq_other() - Stop running processes
528 528
 function stop_mutnauq_other {
529 529
     if is_service_enabled q-dhcp; then
530 530
         stop_process q-dhcp
... ...
@@ -882,7 +882,7 @@ function start_nova_compute {
882 882
     export PATH=$old_path
883 883
 }
884 884
 
885
-# start_nova() - Start running processes, including screen
885
+# start_nova() - Start running processes
886 886
 function start_nova_rest {
887 887
     # Hack to set the path for rootwrap
888 888
     local old_path=$PATH
... ...
@@ -999,7 +999,7 @@ function stop_nova_conductor {
999 999
     done
1000 1000
 }
1001 1001
 
1002
-# stop_nova() - Stop running processes (non-screen)
1002
+# stop_nova() - Stop running processes
1003 1003
 function stop_nova {
1004 1004
     stop_nova_rest
1005 1005
     stop_nova_conductor
... ...
@@ -7,7 +7,7 @@
7 7
 #
8 8
 # - ``functions`` file
9 9
 # - ``apache`` file
10
-# - ``DEST``, ``SCREEN_NAME``, `SWIFT_HASH` must be defined
10
+# - ``DEST``, `SWIFT_HASH` must be defined
11 11
 # - ``STACK_USER`` must be defined
12 12
 # - ``SWIFT_DATA_DIR`` or ``DATA_DIR`` must be defined
13 13
 # - ``lib/keystone`` file
... ...
@@ -780,7 +780,7 @@ function install_ceilometermiddleware {
780 780
     fi
781 781
 }
782 782
 
783
-# start_swift() - Start running processes, including screen
783
+# start_swift() - Start running processes
784 784
 function start_swift {
785 785
     # (re)start memcached to make sure we have a clean memcache.
786 786
     restart_service memcached
... ...
@@ -799,13 +799,6 @@ function start_swift {
799 799
         restart_apache_server
800 800
         # The rest of the services should be started in backgroud
801 801
         swift-init --run-dir=${SWIFT_DATA_DIR}/run rest start
802
-        # Be we still want the logs of Swift Proxy in our screen session
803
-        tail_log s-proxy /var/log/$APACHE_NAME/proxy-server
804
-        if [[ ${SWIFT_REPLICAS} == 1 ]]; then
805
-            for type in object container account; do
806
-                tail_log s-${type} /var/log/$APACHE_NAME/${type}-server-1
807
-            done
808
-        fi
809 802
         return 0
810 803
     fi
811 804
 
... ...
@@ -859,7 +852,7 @@ function start_swift {
859 859
     fi
860 860
 }
861 861
 
862
-# stop_swift() - Stop running processes (non-screen)
862
+# stop_swift() - Stop running processes
863 863
 function stop_swift {
864 864
     local type
865 865
 
... ...
@@ -81,7 +81,7 @@ function install_XXXX {
81 81
     :
82 82
 }
83 83
 
84
-# start_XXXX() - Start running processes, including screen
84
+# start_XXXX() - Start running processes
85 85
 function start_XXXX {
86 86
     # The quoted command must be a single command and not include an
87 87
     # shell metacharacters, redirections or shell builtins.
... ...
@@ -89,7 +89,7 @@ function start_XXXX {
89 89
     :
90 90
 }
91 91
 
92
-# stop_XXXX() - Stop running processes (non-screen)
92
+# stop_XXXX() - Stop running processes
93 93
 function stop_XXXX {
94 94
     # for serv in serv-a serv-b; do
95 95
     #     stop_process $serv