From d864e78149e8b4c7e29b00371191caf39c70f356 Mon Sep 17 00:00:00 2001 From: Kyungwook Tak Date: Wed, 27 Apr 2016 18:29:40 +0900 Subject: [PATCH] Popup service configuration changed timeout time: 10sec. if it's too small and service wake up too quickly repeatedly, it can be refused by systemd. removed from default.targets popup service shouldn't be run when boot up Change-Id: I2ba37456cb15597db47676fd139cc224378f65ee Signed-off-by: Kyungwook Tak --- packaging/csr-framework.spec | 5 ----- src/framework/ui/popup/main.cpp | 5 ++++- systemd/csr-popup.service.in | 3 --- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/packaging/csr-framework.spec b/packaging/csr-framework.spec index c2de015..5972f99 100644 --- a/packaging/csr-framework.spec +++ b/packaging/csr-framework.spec @@ -105,10 +105,6 @@ mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants mkdir -p %{buildroot}%{_unitdir}/sockets.target.wants ln -s ../%{service_name}.service %{buildroot}%{_unitdir}/multi-user.target.wants/%{service_name}.service ln -s ../%{service_name}.socket %{buildroot}%{_unitdir}/sockets.target.wants/%{service_name}.socket - -mkdir -p %{buildroot}%{_unitdir}/default.target.wants -mkdir -p %{buildroot}%{_unitdir}/sockets.target.wants -ln -s ../%{service_name}-popup.service %{buildroot}%{_unitdir}/default.target.wants/%{service_name}-popup.service ln -s ../%{service_name}-popup.socket %{buildroot}%{_unitdir}/sockets.target.wants/%{service_name}-popup.socket mkdir -p %{buildroot}%{ro_data_dir}/license @@ -166,7 +162,6 @@ fi %{_unitdir}/%{service_name}.service %{_unitdir}/sockets.target.wants/%{service_name}.socket %{_unitdir}/%{service_name}.socket -%{_unitdir}/default.target.wants/%{service_name}-popup.service %{_unitdir}/%{service_name}-popup.service %{_unitdir}/sockets.target.wants/%{service_name}-popup.socket %{_unitdir}/%{service_name}-popup.socket diff --git a/src/framework/ui/popup/main.cpp b/src/framework/ui/popup/main.cpp index 7a99723..7f59c3d 100644 --- a/src/framework/ui/popup/main.cpp +++ b/src/framework/ui/popup/main.cpp @@ -64,7 +64,10 @@ int main(int argc, char **argv) Csr::Ui::PopupService service("/tmp/." SERVICE_NAME "-popup.socket"); - service.start(0); + // timeout when idle for 10 sec. If timeout time is too small and + // popup service wakes up repeatedly too quickly, it can be refused + // by systemd. + service.start(1000 * 10); return 0; } catch (const std::exception &e) { diff --git a/systemd/csr-popup.service.in b/systemd/csr-popup.service.in index 9e2d6d4..7481bcc 100644 --- a/systemd/csr-popup.service.in +++ b/systemd/csr-popup.service.in @@ -9,6 +9,3 @@ SmackProcessLabel=@SERVICE_NAME@ EnvironmentFile=/run/tizen-mobile-env ExecStart=@BIN_DIR@/@SERVICE_NAME@-popup Sockets=@SERVICE_NAME@-popup.socket - -[Install] -WantedBy=default.target -- 2.7.4