Cherry picked d591598

BOINC · Mar 6, 2020 · e0adb58 · e0adb58
1 parent 77405e5
commit e0adb58
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/sched/handle_request.cpp b/sched/handle_request.cpp
@@ -1418,10 +1418,12 @@ void process_request(char* code_sign_key) {
                 if (diff < config.min_sendwork_interval) {
                     ok_to_send_work = false;
                     log_messages.printf(MSG_NORMAL,
-                        "Not sending work - last request too recent: %f\n", diff
+                        "Not sending work. Last request too recent. Please wait %d seconds.\n",
+                        (int)(config.min_sendwork_interval - diff)
                     );
                     sprintf(buf,
-                        "Not sending work - last request too recent: %d sec", (int)diff
+                        "Not sending work. Last request too recent. Please wait %d seconds.\n",
+                        (int)(config.min_sendwork_interval - diff)
                     );
                     g_reply->insert_message(buf, "low");
 

diff --git a/sched/sched_version.cpp b/sched/sched_version.cpp
@@ -151,7 +151,9 @@ inline bool daily_quota_exceeded(DB_ID_TYPE gavid, HOST_USAGE& hu) {
 }
 
 bool daily_quota_exceeded(BEST_APP_VERSION* bavp) {
-    return daily_quota_exceeded(bavp->avp->id, bavp->host_usage);
+    DB_HOST_APP_VERSION* havp = bavp->host_app_version();
+    if (!havp) return false;
+    return daily_quota_exceeded(havp->app_version_id, bavp->host_usage);
 }
 
 // scan through client's anonymous apps and pick the best one