Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/static/app/js/components/TaskListItem.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@ class TaskListItem extends React.Component {
});
}

if (!task.last_error && task.status === null && (task.processing_node || imported) && task.partial && !task.pending_action && this.props.hasPermission("change")){
if (!task.last_error && task.status === null && (task.processing_node || imported) && task.partial && (!task.pending_action || (task.pending_action === pendingActions.RESIZE && !task.resize_progress)) && this.props.hasPermission("change")){
addActionButton(_("Start Processing"), "btn-primary", "glyphicon glyphicon-saved", this.genActionApiCall("commit", {
confirm: _("Have all images been uploaded?"),
defaultError: _("Cannot start processing task.")
Expand Down Expand Up @@ -793,7 +793,7 @@ class TaskListItem extends React.Component {
statusLabel = getStatusLabel(_("Set a processing node"));
statusIcon = "far fa-hourglass";
showEditLink = true;
}else if (task.partial && !task.pending_action){
}else if (task.partial && (!task.pending_action || (task.pending_action === pendingActions.RESIZE && !task.resize_progress))){
statusIcon = "far fa-hourglass";
statusLabel = getStatusLabel(_("Waiting to start processing..."));
}else{
Expand Down
2 changes: 1 addition & 1 deletion start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ else
congrats

nginx -c $(pwd)/nginx/$conf
gunicorn webodm.wsgi --bind unix:/tmp/gunicorn.sock --timeout 300000 --max-requests 500 --workers $WEB_CONCURRENCY --preload
gunicorn webodm.wsgi --bind unix:/tmp/gunicorn.sock --timeout 300000 --max-requests 5000 --workers $WEB_CONCURRENCY --preload
fi

# If this is executed, it means the previous command failed, don't display the congratulations message
Expand Down