fix hanging stream if line not matching filter

Author: niveau0

src/repository/filerepo.rs

@@ -108,25 +108,24 @@ impl FileLogStream {
     fn next_line(&mut self) -> Poll<Option<Result<StreamEntry, ApplicationError>>> {
         let lines_iter = self.lines_iter.as_mut();
         let lines_iter = lines_iter.unwrap(); // should panic, if this is called with None option
-        let nextline = lines_iter.next();
-        match nextline {
-            Some(lineresult) => match lineresult {
+        while let Some(nextline) = lines_iter.next() {
+            match nextline {
                 Ok(line) => {
                     let parsed_line =
                         FileLogStream::apply_pattern(&line, &self.line_pattern, self.year);
                     if !self.logfilter.matches(&parsed_line) {
-                        Poll::Pending
+                        continue;
                     } else {
-                        Poll::Ready(Some(Ok(StreamEntry::LogLine { line, parsed_line })))
+                        return Poll::Ready(Some(Ok(StreamEntry::LogLine { line, parsed_line })));
                     }
                 }
                 Err(e) => {
                     error!("Stream error: {:?}", e);
-                    Poll::Ready(None)
+                    break;
                 }
-            },
-            None => Poll::Ready(None),
+            }
         }
+        Poll::Ready(None)
     }
 }
 

tests/server_test.rs

@@ -97,9 +97,7 @@ fn itest_get_source_content_api_with_logfilter() {
                     .header("User-Agent", "Actix-web")
                     .header("Accept", "*/*")
                     .timeout(std::time::Duration::from_millis(1000));
-
                     support::http_request(req, StatusCode::OK).map(|s| {
-                        dbg!(&s);
                         assert_eq!(
                             s,
                             r#"2019-01-01 08:00:02 DEBUG demo2line2
@@ -125,6 +123,7 @@ fn setup() -> Arc<ProcessHolder> {
         None => {
             let exe = support::binary("tentacle").unwrap();
             let process = std::process::Command::new(exe)
+                // .arg("-vvv")
                 .arg("--config=tests/integrationtests.yml")
                 .spawn()
                 .expect("Failed to run server");