From d26c5ebca6ce4dbdb1cd5dd18d39d5095439610328e9f5fb9a2d21466bc79f6b Mon Sep 17 00:00:00 2001 From: Andrii Nikitin Date: Thu, 3 Feb 2022 09:28:27 +0000 Subject: [PATCH 1/4] - Update to version 1.024: * Allow multiple subsidiaries per region (#250) * Add internal timeouts for mirror checks and rendering (#249, #252) OBS-URL: https://build.opensuse.org/package/show/openSUSE:infrastructure:MirrorCache/MirrorCache?expand=0&rev=44 --- MirrorCache-1.023.obscpio | 3 --- MirrorCache-1.024.obscpio | 3 +++ MirrorCache.changes | 7 +++++++ MirrorCache.obsinfo | 6 +++--- MirrorCache.spec | 2 +- 5 files changed, 14 insertions(+), 7 deletions(-) delete mode 100644 MirrorCache-1.023.obscpio create mode 100644 MirrorCache-1.024.obscpio diff --git a/MirrorCache-1.023.obscpio b/MirrorCache-1.023.obscpio deleted file mode 100644 index 3b22fad..0000000 --- a/MirrorCache-1.023.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5d81fe4a6a7ba855cadd7f09ad5f17842f5a6068d968045257b4e990679c7a22 -size 835596 diff --git a/MirrorCache-1.024.obscpio b/MirrorCache-1.024.obscpio new file mode 100644 index 0000000..08e59b4 --- /dev/null +++ b/MirrorCache-1.024.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df884a134178ed76d8704ecf9e602df3f33befc963a2695ea688973025f3f520 +size 839180 diff --git a/MirrorCache.changes b/MirrorCache.changes index 61b821a..e74a290 100644 --- a/MirrorCache.changes +++ b/MirrorCache.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Feb 03 09:23:28 UTC 2022 - Andrii Nikitin + +- Update to version 1.024: + * Allow multiple subsidiaries per region (#250) + * Add internal timeouts for mirror checks and rendering (#249, #252) + ------------------------------------------------------------------- Thu Jan 20 07:46:09 UTC 2022 - Andrii Nikitin diff --git a/MirrorCache.obsinfo b/MirrorCache.obsinfo index 61df1e6..43b9937 100644 --- a/MirrorCache.obsinfo +++ b/MirrorCache.obsinfo @@ -1,4 +1,4 @@ name: MirrorCache -version: 1.023 -mtime: 1642197733 -commit: 7c9c68a96f6b49d5e97670f57e64aa252a9af22a +version: 1.024 +mtime: 1643879887 +commit: ae811c8ec5d14c14f6a78084c0600dc27330760b diff --git a/MirrorCache.spec b/MirrorCache.spec index b7a1d4f..e6e6575 100644 --- a/MirrorCache.spec +++ b/MirrorCache.spec @@ -22,7 +22,7 @@ %define main_requires %{assetpack_requires} perl(Carp) perl(DBD::Pg) >= 3.7.4 perl(DBI) >= 1.632 perl(DBIx::Class) >= 0.082801 perl(DBIx::Class::DynamicDefault) perl(DateTime) perl(Encode) perl(Time::Piece) perl(Time::Seconds) perl(Time::ParseDate) perl(DateTime::Format::Pg) perl(Exporter) perl(File::Basename) perl(LWP::UserAgent) perl(Mojo::Base) perl(Mojo::ByteStream) perl(Mojo::IOLoop) perl(Mojo::JSON) perl(Mojo::Pg) perl(Mojo::URL) perl(Mojo::Util) perl(Mojolicious::Commands) perl(Mojolicious::Plugin) perl(Mojolicious::Plugin::RenderFile) perl(Mojolicious::Static) perl(Net::OpenID::Consumer) perl(POSIX) perl(Sort::Versions) perl(URI::Escape) perl(XML::Writer) perl(base) perl(constant) perl(diagnostics) perl(strict) perl(warnings) shadow rubygem(sass) perl(Net::DNS) perl(LWP::Protocol::https) perl(Digest::SHA) %define build_requires %{assetpack_requires} rubygem(sass) tidy sysuser-shadow sysuser-tools Name: MirrorCache -Version: 1.023 +Version: 1.024 Release: 0 Summary: WebApp to redirect and manage mirrors License: GPL-2.0-or-later From f162efea9571374a6878eab7a50144fa20096facb6510770f94f486333332676 Mon Sep 17 00:00:00 2001 From: Andrii Nikitin Date: Thu, 3 Feb 2022 10:21:07 +0000 Subject: [PATCH 2/4] Add patch to address https://github.com/openSUSE/MirrorCache/pull/253 OBS-URL: https://build.opensuse.org/package/show/openSUSE:infrastructure:MirrorCache/MirrorCache?expand=0&rev=45 --- MirrorCache.spec | 2 ++ pr253.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 pr253.patch diff --git a/MirrorCache.spec b/MirrorCache.spec index e6e6575..582ae8c 100644 --- a/MirrorCache.spec +++ b/MirrorCache.spec @@ -34,6 +34,7 @@ Source2: %{name}-user.conf Source3: %{name}-tmpfilesd.conf # use update-cache (or tools/generate-packed-assets) to generate/update cache.tar.xz Source101: update-cache.sh +Patch1: pr253.patch BuildRequires: %{build_requires} Requires: %{main_requires} Requires: perl(Minion) >= 10.0 @@ -45,6 +46,7 @@ Mirror redirector web service, which automatically scans the main server and mir %prep %setup -q -a1 +%patch1 -p1 %build # make {?_smp_mflags} diff --git a/pr253.patch b/pr253.patch new file mode 100644 index 0000000..fa42856 --- /dev/null +++ b/pr253.patch @@ -0,0 +1,13 @@ +index f8f9e05..d69c158 100644 +--- a/lib/MirrorCache/WebAPI/Plugin/Dir.pm ++++ b/lib/MirrorCache/WebAPI/Plugin/Dir.pm +@@ -117,7 +117,7 @@ sub render_dir_remote { + my $reftx = $tx; + }; + +- $c->minion->result_p($job_id)->timeout->($RENDER_DIR_REMOTE_PROMISE_TIMEOUT)->catch($handle_error)->then(sub { ++ $c->minion->result_p($job_id)->timeout($RENDER_DIR_REMOTE_PROMISE_TIMEOUT)->catch($handle_error)->then(sub { + $c->emit_event('mc_debug', "promiseok: $job_id"); + _render_dir($dm, $dir); + my $reftx = $tx; + From b2adbb19cf33228890302c88cd8f46a1cae693d5a0b70484ad575b8ed3dfcbff Mon Sep 17 00:00:00 2001 From: Andrii Nikitin Date: Thu, 10 Feb 2022 11:30:38 +0000 Subject: [PATCH 3/4] - Update to version 1.025: * Allow headquarter be in HA subsidiary handling (#255) * Stat log after render (#256) * Add SMALL_FILE_SIZE to serve small files directly from ROOT_NFS (#254) OBS-URL: https://build.opensuse.org/package/show/openSUSE:infrastructure:MirrorCache/MirrorCache?expand=0&rev=46 --- MirrorCache-1.024.obscpio | 3 --- MirrorCache-1.025.obscpio | 3 +++ MirrorCache.changes | 8 ++++++++ MirrorCache.obsinfo | 6 +++--- MirrorCache.spec | 6 ++---- pr253.patch | 13 ------------- 6 files changed, 16 insertions(+), 23 deletions(-) delete mode 100644 MirrorCache-1.024.obscpio create mode 100644 MirrorCache-1.025.obscpio delete mode 100644 pr253.patch diff --git a/MirrorCache-1.024.obscpio b/MirrorCache-1.024.obscpio deleted file mode 100644 index 08e59b4..0000000 --- a/MirrorCache-1.024.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:df884a134178ed76d8704ecf9e602df3f33befc963a2695ea688973025f3f520 -size 839180 diff --git a/MirrorCache-1.025.obscpio b/MirrorCache-1.025.obscpio new file mode 100644 index 0000000..d0474cd --- /dev/null +++ b/MirrorCache-1.025.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65a93f4cdde9a118a3d90cd4b463106dbaf728645c723542d2f6452893b04ebd +size 842764 diff --git a/MirrorCache.changes b/MirrorCache.changes index e74a290..e8d9694 100644 --- a/MirrorCache.changes +++ b/MirrorCache.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Feb 10 11:27:57 UTC 2022 - Andrii Nikitin + +- Update to version 1.025: + * Allow headquarter be in HA subsidiary handling (#255) + * Stat log after render (#256) + * Add SMALL_FILE_SIZE to serve small files directly from ROOT_NFS (#254) + ------------------------------------------------------------------- Thu Feb 03 09:23:28 UTC 2022 - Andrii Nikitin diff --git a/MirrorCache.obsinfo b/MirrorCache.obsinfo index 43b9937..98b0264 100644 --- a/MirrorCache.obsinfo +++ b/MirrorCache.obsinfo @@ -1,4 +1,4 @@ name: MirrorCache -version: 1.024 -mtime: 1643879887 -commit: ae811c8ec5d14c14f6a78084c0600dc27330760b +version: 1.025 +mtime: 1644489456 +commit: a025a68eac1adc2c1bdaf5df1c45dbc011bf94bd diff --git a/MirrorCache.spec b/MirrorCache.spec index 582ae8c..5e4f634 100644 --- a/MirrorCache.spec +++ b/MirrorCache.spec @@ -22,7 +22,7 @@ %define main_requires %{assetpack_requires} perl(Carp) perl(DBD::Pg) >= 3.7.4 perl(DBI) >= 1.632 perl(DBIx::Class) >= 0.082801 perl(DBIx::Class::DynamicDefault) perl(DateTime) perl(Encode) perl(Time::Piece) perl(Time::Seconds) perl(Time::ParseDate) perl(DateTime::Format::Pg) perl(Exporter) perl(File::Basename) perl(LWP::UserAgent) perl(Mojo::Base) perl(Mojo::ByteStream) perl(Mojo::IOLoop) perl(Mojo::JSON) perl(Mojo::Pg) perl(Mojo::URL) perl(Mojo::Util) perl(Mojolicious::Commands) perl(Mojolicious::Plugin) perl(Mojolicious::Plugin::RenderFile) perl(Mojolicious::Static) perl(Net::OpenID::Consumer) perl(POSIX) perl(Sort::Versions) perl(URI::Escape) perl(XML::Writer) perl(base) perl(constant) perl(diagnostics) perl(strict) perl(warnings) shadow rubygem(sass) perl(Net::DNS) perl(LWP::Protocol::https) perl(Digest::SHA) %define build_requires %{assetpack_requires} rubygem(sass) tidy sysuser-shadow sysuser-tools Name: MirrorCache -Version: 1.024 +Version: 1.025 Release: 0 Summary: WebApp to redirect and manage mirrors License: GPL-2.0-or-later @@ -34,7 +34,6 @@ Source2: %{name}-user.conf Source3: %{name}-tmpfilesd.conf # use update-cache (or tools/generate-packed-assets) to generate/update cache.tar.xz Source101: update-cache.sh -Patch1: pr253.patch BuildRequires: %{build_requires} Requires: %{main_requires} Requires: perl(Minion) >= 10.0 @@ -46,7 +45,6 @@ Mirror redirector web service, which automatically scans the main server and mir %prep %setup -q -a1 -%patch1 -p1 %build # make {?_smp_mflags} @@ -81,7 +79,7 @@ install -D -m 0644 %{SOURCE3} %{buildroot}%{_tmpfilesdir}/%{name}.conf %service_del_postun_without_restart mirrorcache-hypnotoad.service %files -%doc README.md +%doc README.asciidoc %license LICENSE %{_sbindir}/rcmirrorcache %{_sbindir}/rcmirrorcache-hypnotoad diff --git a/pr253.patch b/pr253.patch deleted file mode 100644 index fa42856..0000000 --- a/pr253.patch +++ /dev/null @@ -1,13 +0,0 @@ -index f8f9e05..d69c158 100644 ---- a/lib/MirrorCache/WebAPI/Plugin/Dir.pm -+++ b/lib/MirrorCache/WebAPI/Plugin/Dir.pm -@@ -117,7 +117,7 @@ sub render_dir_remote { - my $reftx = $tx; - }; - -- $c->minion->result_p($job_id)->timeout->($RENDER_DIR_REMOTE_PROMISE_TIMEOUT)->catch($handle_error)->then(sub { -+ $c->minion->result_p($job_id)->timeout($RENDER_DIR_REMOTE_PROMISE_TIMEOUT)->catch($handle_error)->then(sub { - $c->emit_event('mc_debug', "promiseok: $job_id"); - _render_dir($dm, $dir); - my $reftx = $tx; - From ae0ff0ddb575d7a43467da48e0f86c2212689a56fe06cb2c5ea61a6c88f6aa83 Mon Sep 17 00:00:00 2001 From: Andrii Nikitin Date: Thu, 10 Feb 2022 11:34:34 +0000 Subject: [PATCH 4/4] Fix README extention in spec OBS-URL: https://build.opensuse.org/package/show/openSUSE:infrastructure:MirrorCache/MirrorCache?expand=0&rev=47 --- MirrorCache.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MirrorCache.spec b/MirrorCache.spec index 5e4f634..dc34eea 100644 --- a/MirrorCache.spec +++ b/MirrorCache.spec @@ -79,7 +79,7 @@ install -D -m 0644 %{SOURCE3} %{buildroot}%{_tmpfilesdir}/%{name}.conf %service_del_postun_without_restart mirrorcache-hypnotoad.service %files -%doc README.asciidoc +%doc README.md %license LICENSE %{_sbindir}/rcmirrorcache %{_sbindir}/rcmirrorcache-hypnotoad