From 141db60ee66ef76c632d514398e959e4fea4119f Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <drabotyagov@vexxhost.com>
Date: Mon, 22 Jul 2019 16:40:15 +0300
Subject: [PATCH] Use systemd-journald instead of log files

This patch aims to migrate service from usage of regular syslog files
to journald.

Change-Id: I9ee285aeae85ccf6827a652dcd4ff06958141615
---
 defaults/main.yml                  |  1 -
 tasks/memcached_config.yml         | 26 --------------------------
 templates/memcached.conf.debian.j2 |  1 -
 tests/test.yml                     |  7 -------
 4 files changed, 35 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 4b8fe57..0cf9384 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -47,7 +47,6 @@ memcached_memory: "{{ base_memcached_memory | int // 4 if base_memcached_memory
 
 memcached_port: 11211
 memcached_listen: "127.0.0.1"
-memcached_log: /var/log/memcached/memcached.log
 memcached_connections: 4096
 memcached_threads: 4
 memcached_file_limits: "{{ memcached_connections | int + 1024 }}"
diff --git a/tasks/memcached_config.yml b/tasks/memcached_config.yml
index d6c630d..c6314e0 100644
--- a/tasks/memcached_config.yml
+++ b/tasks/memcached_config.yml
@@ -13,32 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Test for log directory or link
-  shell: |
-    if [ -h "{{ memcached_log | dirname }}"  ]; then
-      chown -c -h root:root "{{ memcached_log | dirname }}"
-      chown -c -R root:root "$(readlink {{ memcached_log | dirname }})"
-    else
-      exit 1
-    fi
-  register: log_dir
-  failed_when: false
-  changed_when: log_dir.rc == 1 or "changed" in log_dir.stdout
-
-- name: Show the changes if verbose
-  debug:
-    var: log_dir.stdout_lines
-    verbosity: 1
-  when: "'changed' in log_dir.stdout"
-
-- name: Create memcached log dir
-  file:
-    path: "{{ memcached_log | dirname }}"
-    state: directory
-    owner: root
-    group: root
-  when: log_dir.rc == 1
-
 - name: Apply memcached config
   template:
     src: "{{ memcached_conf_template }}"
diff --git a/templates/memcached.conf.debian.j2 b/templates/memcached.conf.debian.j2
index f70c643..2dcf79a 100644
--- a/templates/memcached.conf.debian.j2
+++ b/templates/memcached.conf.debian.j2
@@ -6,7 +6,6 @@
 {% else %}
 -v
 {% endif %}
-logfile {{ memcached_log }}
 -U 0
 -m {{ memcached_memory }}
 -p {{ memcached_port }}
diff --git a/tests/test.yml b/tests/test.yml
index 721b0c4..45e6007 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -21,10 +21,6 @@
   roles:
     - role: "memcached_server"
   post_tasks:
-    - name: Open memcached log file
-      stat:
-        path: "{{ memcached_log }}"
-      register: memcached_log_stat
     - name: Check memcache is running
       command: pgrep -a memcached
       changed_when: false
@@ -36,9 +32,6 @@
     - name: Check role functions
       assert:
         that:
-          # TODO(mattt): Uncomment these once we have figured out systemd logging
-          #- "memcached_log_stat.stat.exists"
-          #- "'logfile /var/log/memcached/memcached.log' in memcached_file_content"
           - "'-p 11211' in memcached_proc.stdout"
           - "'-u {{ memcached_user }}' in memcached_proc.stdout"
           - "'-l 127.0.0.1' in memcached_proc.stdout"