Browse Source

Enhancement & bugfix in #11 solution

Yann Weber 6 years ago
parent
commit
489f5b801c
2 changed files with 34 additions and 0 deletions
  1. 18
    0
      src/ttail_search_files.c
  2. 16
    0
      src/ttail_search_std.c

+ 18
- 0
src/ttail_search_files.c View File

@@ -549,6 +549,24 @@ int _ttail_search_files_fmt_init(ttail_t* t)
549 549
 				break;
550 550
 			}
551 551
 			buff = ttail_logline_subst(t, ttail_file_getline_buf(t));
552
+			if(!buff)
553
+			{
554
+				if(ttail_permissive(t))
555
+				{
556
+					continue;
557
+				}
558
+
559
+				fprintf(stderr,
560
+					"Unable to find prefix in '%s' logline",
561
+					t->logfile_name[i]);
562
+				if(t->verbose > 0)
563
+				{
564
+					fprintf(stderr, " : '%s'",
565
+						ttail_file_getline_buf(t));
566
+				}
567
+				fprintf(stderr, "\n");
568
+				return -1;
569
+			}
552 570
 			//buff contains the lines starting by the date
553 571
 			fmt_id = ttail_format_guess(buff, NULL);
554 572
 			if(fmt_id >= 0)

+ 16
- 0
src/ttail_search_std.c View File

@@ -58,6 +58,22 @@ int _ttail_search_std_fmt_init(ttail_t* t)
58 58
 		}
59 59
 
60 60
 		buff = ttail_logline_subst(t, ttail_std_getline_buff(t));
61
+		if(!buff)
62
+		{
63
+			if(ttail_permissive(t))
64
+			{
65
+				continue;
66
+			}
67
+
68
+			fprintf(stderr, "Unable to find prefix in logline");
69
+			if(t->verbose > 0)
70
+			{
71
+				fprintf(stderr, " : '%s'",
72
+					ttail_std_getline_buff(t));
73
+			}
74
+			fprintf(stderr, "\n");
75
+			return -1;
76
+		}
61 77
 		fmt_id = ttail_format_guess(buff, NULL);
62 78
 		if(fmt_id >= 0)
63 79
 		{

Loading…
Cancel
Save