diff --git a/Web/lib/MJB/Web/Controller/Blog.pm b/Web/lib/MJB/Web/Controller/Blog.pm index 8753b12..eb51e7a 100644 --- a/Web/lib/MJB/Web/Controller/Blog.pm +++ b/Web/lib/MJB/Web/Controller/Blog.pm @@ -62,7 +62,8 @@ sub do_create ($c) { # Schedule a job to deploy the website my $ssl_job_id = $c->minion->enqueue( 'create_ssl_cert', [ $blog->id ], { - notes => { '_mjb_bid_' . $blog->id => 1 }, + notes => { '_bid_' . $blog->id => 1 }, + priority => $blog->build_priority, queue => 'certbot', }); $blog->create_related( 'builds', { job_id => $ssl_job_id } ); @@ -101,7 +102,8 @@ sub do_settings ( $c ) { $jekyll->write_config; my $build_job_id = $c->minion->enqueue( 'deploy_blog', [ $blog->id ], { - notes => { '_mjb_bid_' . $blog->id => 1 }, + notes => { '_bid_' . $blog->id => 1 }, + priority => $blog->build_priority, }); $blog->create_related( 'builds', { job_id => $build_job_id } ); diff --git a/Web/lib/MJB/Web/Controller/Dashboard.pm b/Web/lib/MJB/Web/Controller/Dashboard.pm index 6b7a463..4e95623 100644 --- a/Web/lib/MJB/Web/Controller/Dashboard.pm +++ b/Web/lib/MJB/Web/Controller/Dashboard.pm @@ -79,7 +79,10 @@ sub do_blog_post ( $c ) { $jekyll->write_post( $post ); - my $build_job_id = $c->minion->enqueue( 'deploy_blog', [ $blog->id ] ); + my $build_job_id = $c->minion->enqueue( 'deploy_blog', [ $blog->id ], { + notes => { '_bid_' . $blog->id => 1 }, + priority => $blog->build_priority, + }); $blog->create_related( 'builds', { job_id => $build_job_id } ); $c->flash( confirmation => "Updated $title!" ); @@ -145,7 +148,10 @@ sub do_blog_post_create ( $c ) { $jekyll->write_post( $post ); - my $build_job_id = $c->minion->enqueue( 'deploy_blog', [ $blog->id ] ); + my $build_job_id = $c->minion->enqueue( 'deploy_blog', [ $blog->id ], { + notes => { '_bid_' . $blog->id => 1 }, + priority => $blog->build_priority, + }); $blog->create_related( 'builds', { job_id => $build_job_id } ); $c->flash( confirmation => "Created $title!" ); @@ -295,7 +301,10 @@ sub do_blog_media_remove( $c ) { $jekyll->remove_file( $media_file->to_string, "Removed media file" . $media_file->basename ); } - my $build_job_id = $c->minion->enqueue( 'deploy_blog', [ $blog->id ] ); + my $build_job_id = $c->minion->enqueue( 'deploy_blog', [ $blog->id ], { + notes => { '_bid_' . $blog->id => 1 }, + priority => $blog->build_priority, + }); $blog->create_related( 'builds', { job_id => $build_job_id } ); $c->flash( confirmation => "Removed " . $media_file->basename ); @@ -330,7 +339,10 @@ sub do_blog_media ( $c ) { "Add media " . $upload->filename ); - my $build_job_id = $c->minion->enqueue( 'deploy_blog', [ $blog->id ] ); + my $build_job_id = $c->minion->enqueue( 'deploy_blog', [ $blog->id ], { + notes => { '_bid_' . $blog->id => 1 }, + priority => $blog->build_priority, + }); $blog->create_related( 'builds', { job_id => $build_job_id } ); $c->flash( confirmation => "Uploaded file!" ); diff --git a/Web/templates/dashboard/_blog_nav.html.ep b/Web/templates/dashboard/_blog_nav.html.ep index 3c80a09..7286dac 100644 --- a/Web/templates/dashboard/_blog_nav.html.ep +++ b/Web/templates/dashboard/_blog_nav.html.ep @@ -38,12 +38,19 @@ % }