From 4cd085e0852d29a5606bda6215665b5ca6df8f26 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sat, 15 Jan 2022 17:18:55 -0500 Subject: [PATCH 1/3] Bump eslint to ECMA2017 --- .eslintrc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index 0bb050ad1..16cbb37ba 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -3,7 +3,7 @@ module.exports = { "env": { "browser": true, - "es6": true, + "es2017": true, }, "extends": ["google"], "overrides": [{ From 1891002c65e6e19a59604e06b11c7573901a8672 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sat, 15 Jan 2022 17:19:10 -0500 Subject: [PATCH 2/3] Remove Freenode from the badges. --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 2249f1752..da96b3e60 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,6 @@ ZoneMinder [![Build Status](https://travis-ci.org/ZoneMinder/zoneminder.png)](https://travis-ci.org/ZoneMinder/zoneminder) [![Bounty Source](https://api.bountysource.com/badge/team?team_id=204&style=bounties_received)](https://www.bountysource.com/teams/zoneminder/issues?utm_source=ZoneMinder&utm_medium=shield&utm_campaign=bounties_received) [![Join Slack](https://github.com/ozonesecurity/ozonebase/blob/master/img/slacksm.png?raw=true)](https://join.slack.com/t/zoneminder-chat/shared_invite/enQtNTU0NDkxMDM5NDQwLTdhZmQ5Y2M2NWQyN2JkYTBiN2ZkMzIzZGQ0MDliMTRmM2FjZWRlYzUwYTQ2MjMwMTVjMzQ1NjYxOTdmMjE2MTE) -[![IRC Network](https://img.shields.io/badge/irc-%23zoneminder-blue.svg "IRC Freenode")](https://webchat.freenode.net/?channels=zoneminder) All documentation for ZoneMinder is now online at https://zoneminder.readthedocs.org From 5f17cb6e9a8c65611eb1b3589a1d9b43f51be26e Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sat, 15 Jan 2022 17:19:30 -0500 Subject: [PATCH 3/3] Debug the size returned as compared to the file size --- src/zm_eventstream.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/zm_eventstream.cpp b/src/zm_eventstream.cpp index 927c3b3aa..54f6b60d8 100644 --- a/src/zm_eventstream.cpp +++ b/src/zm_eventstream.cpp @@ -1126,7 +1126,8 @@ bool EventStream::send_file(const std::string &filepath) { } else { Debug(1, "Failed to sendfile?"); } - Warning("Unable to send raw frame %ld: %s rc %d", curr_frame_id, strerror(errno), rc); + Warning("Unable to send raw frame %ld: %s rc %d != %d", + curr_frame_id, strerror(errno), rc, (int)filestat.st_size); #endif static unsigned char temp_img_buffer[ZM_MAX_IMAGE_SIZE];