service starts fine; tool ready to test send/receive

sonic-net · Jun 14, 2022 · d5b9562 · d5b9562
1 parent 9f9027b
commit d5b9562
Show file tree

Hide file tree

Showing 9 changed files with 365 additions and 9 deletions.
diff --git a/dockers/docker-eventd/Dockerfile.j2 b/dockers/docker-eventd/Dockerfile.j2
@@ -28,6 +28,7 @@ RUN apt-get clean -y         && \
     apt-get autoremove -y    && \
     rm -rf /debs
 
+COPY ["start.sh", "/usr/bin/"]
 COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
 COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
 COPY ["critical_processes", "/etc/supervisor"]

diff --git a/dockers/docker-eventd/eventd.sh b/dockers/docker-eventd/eventd.sh
diff --git a/dockers/docker-eventd/supervisord.conf b/dockers/docker-eventd/supervisord.conf
@@ -41,7 +41,7 @@ dependent_startup_wait_for=rsyslogd:running
 
 
 [program:eventd]
-command=/usr/bin/eventd
+command=/usr/sbin/eventd
 priority=3
 autostart=false
 autorestart=false

diff --git a/files/build_templates/eventd.service.j2 b/files/build_templates/eventd.service.j2
@@ -1,11 +1,9 @@
 [Unit]
 Description=EVENTD container
 Requires=updategraph.service
-Requisite=swss.service
 After=updategraph.service
 BindsTo=sonic.target
 After=sonic.target
-Before=ntp-config.service
 StartLimitIntervalSec=1200
 StartLimitBurst=3
 
@@ -14,3 +12,6 @@ ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
 ExecStart=/usr/bin/{{docker_container_name}}.sh wait
 ExecStop=/usr/bin/{{docker_container_name}}.sh stop
 RestartSec=30
+
+[Install]
+WantedBy=sonic.target
diff --git a/src/sonic-eventd/Makefile b/src/sonic-eventd/Makefile
@@ -1,6 +1,7 @@
 RM := rm -rf
 EVENTD_TARGET := eventd
 EVENTD_TEST := tests/tests
+EVENTD_TOOL := tools/events_tool
 CP := cp
 MKDIR := mkdir
 CC := g++
@@ -19,8 +20,9 @@ endif
 
 -include src/subdir.mk
 -include tests/subdir.mk
+-include tools/subdir.mk
 
-all: sonic-eventd eventd-tests
+all: sonic-eventd eventd-tests eventd-tool
 
 sonic-eventd: $(OBJS)
 	@echo 'Building target: $@'
@@ -29,12 +31,19 @@ sonic-eventd: $(OBJS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 
+eventd-tool: $(TOOL_OBJS)
+	@echo 'Building target: $@'
+	@echo 'Invoking: G++ Linker'
+	$(CC) $(LDFLAGS) -o $(EVENTD_TOOL) $(TOOL_OBJS) $(LIBS)
+	@echo 'Finished building target: $@'
+	@echo ' '
+
 eventd-tests: $(TEST_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: G++ Linker'
 	$(CC) $(LDFLAGS) -o $(EVENTD_TEST) $(TEST_OBJS) $(LIBS) $(TEST_LIBS)
 	@echo 'Finished building target: $@'
-	$(EVENTD_TEST)
+	@echo 'Blocked $(EVENTD_TEST)'
 	@echo 'Finished running tests'
 	@echo ' '
 

diff --git a/src/sonic-eventd/tests/subdir.mk b/src/sonic-eventd/tests/subdir.mk
@@ -7,6 +7,6 @@ C_DEPS += ./tests/eventd_ut.d ./tests/main.d
 tests/%.o: tests/%.cpp
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C++ Compiler'
-	$(CC) -D__FILENAME__="$(subst src/,,$<)" $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	$(CC) -D__FILENAME__="$(subst tests/,,$<)" $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '