Skip to content

Commit 94d59e2

Browse files
committed
fix(Makefile): ignore status of data services in make start
The fleet status-matching regexes in the main Makefile didn't take into account the addition of *-data.service jobs, and were therefore reporting on both the status of deis-registry.service and deis-registry-data.service. This PR appends a dot to each regex to avoid matching the *-data.services.
1 parent ce05b21 commit 94d59e2

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,32 +85,32 @@ start: check-fleet start-warning start-routers
8585
@# registry logger cache database
8686
$(call echo_yellow,"Waiting for deis-registry to start...")
8787
$(FLEETCTL) start -no-block $(START_UNITS)
88-
@until $(FLEETCTL) list-units | egrep -q "deis-registry.+(running|failed)"; \
88+
@until $(FLEETCTL) list-units | egrep -q "deis-registry\..+(running|failed)"; \
8989
do sleep 2; \
9090
printf "\033[0;33mStatus:\033[0m "; $(FLEETCTL) list-units | \
91-
grep "deis-registry" | awk '{printf "%-10s (%s) \r", $$4, $$5}'; \
91+
grep "deis-registry\." | awk '{printf "%-10s (%s) \r", $$4, $$5}'; \
9292
sleep 8; \
9393
done
9494
$(call check_for_errors)
9595

9696
@# controller
9797
$(call echo_yellow,"Waiting for deis-controller to start...")
9898
$(FLEETCTL) start -no-block controller/systemd/*
99-
@until $(FLEETCTL) list-units | egrep -q "deis-controller.+(running|failed)"; \
99+
@until $(FLEETCTL) list-units | egrep -q "deis-controller\..+(running|failed)"; \
100100
do sleep 2; \
101101
printf "\033[0;33mStatus:\033[0m "; $(FLEETCTL) list-units | \
102-
grep "deis-controller" | awk '{printf "%-10s (%s) \r", $$4, $$5}'; \
102+
grep "deis-controller\." | awk '{printf "%-10s (%s) \r", $$4, $$5}'; \
103103
sleep 8; \
104104
done
105105
$(call check_for_errors)
106106

107107
@# builder
108108
$(call echo_yellow,"Waiting for deis-builder to start...")
109109
$(FLEETCTL) start -no-block builder/systemd/*.service
110-
@until $(FLEETCTL) list-units | egrep -q "deis-builder.+(running|failed)"; \
110+
@until $(FLEETCTL) list-units | egrep -q "deis-builder\..+(running|failed)"; \
111111
do sleep 2; \
112112
printf "\033[0;33mStatus:\033[0m "; $(FLEETCTL) list-units | \
113-
grep "deis-builder" | awk '{printf "%-10s (%s) \r", $$4, $$5}'; \
113+
grep "deis-builder\." | awk '{printf "%-10s (%s) \r", $$4, $$5}'; \
114114
sleep 8; \
115115
done
116116
$(call check_for_errors)

0 commit comments

Comments
 (0)