fredrik/logcheck
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge??

Browse Source 
Merge branch 'master' of fredrik.wahlberg.se:dev/unixcfg

Conflicts:
	logcheck/testlog
This commit is contained in:
fredrik
2017-06-21 16:35:25 +02:00
parent 9edc33eca7 085865e8d3
commit df2f85a2df
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
logcheck_ubuntu
View File

@@ -162,6 +162,10 @@
#Mar 5 07:36:35 marconi nmbd[28262]: [2017/03/05 07:36:35.792332, 0] ../source3/nmbd/nmbd_workgroupdb.c:276(dump_workgroups)
#Jun 21 16:00:42 marconi update_daemon2.php[27565]: [14:00:42/31191] Purged 0 orphaned posts.
#Jun 21 16:00:42 marconi update_daemon2.php[27565]: [14:00:42/31191] Removed 0 (feeds) 0 (cats) orphaned counter cache entries.
^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ update_daemon2.php\[[[:digit:]]+\]: \[[ .:,/[:digit:]]+

7
testlog
View File

@@ -548,7 +548,14 @@ Apr 20 13:03:42 nada HORDE: [gollem] PHP ERROR: Invalid argument supplied for fo
Apr 24 07:22:45 marconi hass[18805]: #033[32m17-04-24 07:22:45 INFO (MainThread) [homeassistant.components.automation] Executing Portvakten#033[0m
Apr 24 07:22:45 marconi hass[18805]: #033[32m17-04-24 07:22:45 INFO (MainThread) [homeassistant.helpers.script] Script Portvakten: Running script#033[0m
Apr 24 09:35:01 nada HORDE: [horde] User stiy logged out of Horde (80.251.192.97) [pid 6775 on line 107 of "/usr/share/horde/login.php"]
<<<<<<< HEAD
May 3 18:14:45 nada sshd[30553]: error: Received disconnect from 178.215.81.7: 14: No more user authentication methods available. [preauth]
Jun 21 16:00:42 marconi update_daemon2.php[27565]: [14:00:42/31191] Purged 0 orphaned posts.
Jun 21 16:00:42 marconi update_daemon2.php[27565]: [14:00:42/31191] Removed 0 (feeds) 0 (cats) orphaned counter cache entries.
Jun 21 16:00:43 marconi update_daemon2.php[27565]: [14:00:43/27565] [reap_children] child 31186 reaped.
Jun 21 16:00:43 marconi update_daemon2.php[27565]: [14:00:43/27565] [SIGCHLD] jobs left: 0
Jun 21 16:01:07 marconi update_daemon2.php[27565]: [14:01:07/27565] [MASTER] active jobs: 0, next spawn at 60 sec.
>>>>>>> 8de754ff49b588ae6ced80111deb898917528ca0
Aug 23 18:39:24 nada fredrik[1713]: Kontrollrad. Syns detta har vi problem...