Merge pull request #121 from nextcloud/fix/request-exception

fix: catch all HTTP request exceptions

Author: edward-ly

.github/workflows/integration_test.yml

@@ -26,9 +26,9 @@ jobs:
       # do not stop on another job's failure
       fail-fast: false
       matrix:
-        php-versions: [ '8.1' ]
+        php-versions: [ '8.3' ]
         databases: [ 'sqlite' ]
-        server-versions: [ 'master', 'stable31', 'stable30' ]
+        server-versions: [ 'master', 'stable32', 'stable31', 'stable30' ]
 
     name: Integration test on ☁️${{ matrix.server-versions }} 🐘${{ matrix.php-versions }}
 

.github/workflows/reuse.yml

@@ -24,4 +24,4 @@ jobs:
           persist-credentials: false
 
       - name: REUSE Compliance Check
-        uses: fsfe/reuse-action@bb774aa972c2a89ff34781233d275075cbddf542 # v5.0.0
+        uses: fsfe/reuse-action@676e2d560c9a403aa252096d99fcab3e1132b0f5 # v6.0.0

Makefile

@@ -21,12 +21,14 @@ help:
 	@echo " "
 	@echo "  run30             installs $(APP_NAME) for Nextcloud 30"
 	@echo "  run31             installs $(APP_NAME) for Nextcloud 31"
+	@echo "  run32             installs $(APP_NAME) for Nextcloud 32"
 	@echo "  run               installs $(APP_NAME) for Nextcloud Latest"
 	@echo " "
 	@echo "  > Commands for manual registration of ExApp($(APP_NAME) should be running!):"
 	@echo " "
 	@echo "  register30        performs registration of running $(APP_NAME) into the 'manual_install' deploy daemon."
 	@echo "  register31        performs registration of running $(APP_NAME) into the 'manual_install' deploy daemon."
+	@echo "  register32        performs registration of running $(APP_NAME) into the 'manual_install' deploy daemon."
 	@echo "  register          performs registration of running $(APP_NAME) into the 'manual_install' deploy daemon."
 
 
@@ -47,6 +49,12 @@ run31:
 	docker exec master-stable31-1 sudo -u www-data php occ app_api:app:register $(APP_ID) \
 		--info-xml https://raw.githubusercontent.com/nextcloud/$(APP_ID)/main/appinfo/info.xml
 
+.PHONY: run32
+run32:
+	docker exec master-stable32-1 sudo -u www-data php occ app_api:app:unregister $(APP_ID) --silent --force || true
+	docker exec master-stable32-1 sudo -u www-data php occ app_api:app:register $(APP_ID) \
+		--info-xml https://raw.githubusercontent.com/nextcloud/$(APP_ID)/main/appinfo/info.xml
+
 .PHONY: run
 run:
 	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:unregister $(APP_ID) --silent --force || true
@@ -63,6 +71,11 @@ register31:
 	docker exec master-stable31-1 sudo -u www-data php occ app_api:app:unregister $(APP_ID) --silent --force || true
 	docker exec master-stable31-1 sudo -u www-data php occ app_api:app:register $(APP_ID) manual_install --json-info $(JSON_INFO) --wait-finish
 
+.PHONY: register32
+register32:
+	docker exec master-stable32-1 sudo -u www-data php occ app_api:app:unregister $(APP_ID) --silent --force || true
+	docker exec master-stable32-1 sudo -u www-data php occ app_api:app:register $(APP_ID) manual_install --json-info $(JSON_INFO) --wait-finish
+
 .PHONY: register
 register:
 	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:unregister $(APP_ID) --silent --force || true

lib/main.py

@@ -12,7 +12,7 @@
 from threading import Event, Thread
 from time import perf_counter, sleep, strftime
 
-from niquests import HTTPError
+from niquests import RequestException
 from task_processors import generate_task_processors
 from fastapi import FastAPI
 from nc_py_api import AsyncNextcloudApp, NextcloudApp, NextcloudException
@@ -90,7 +90,7 @@ def background_thread_task():
             if not response:
                 sleep(5)
                 continue
-        except (NextcloudException, HTTPError, JSONDecodeError) as e:
+        except (NextcloudException, RequestException, JSONDecodeError) as e:
             log(nc, LogLvl.ERROR, f"Network error fetching the next task {e}")
             sleep(5)
             continue
@@ -118,7 +118,7 @@ def background_thread_task():
                 task["id"],
                 result,
             )
-        except (NextcloudException, HTTPError, JSONDecodeError) as e:
+        except (NextcloudException, RequestException, JSONDecodeError) as e:
             # Error when reporting the result
             exception_info = traceback.format_exception(type(e), e, e.__traceback__)
             log(nc, LogLvl.ERROR, f"Error: {''.join(exception_info)}")
@@ -129,7 +129,7 @@ def background_thread_task():
             try:
                 log(nc, LogLvl.ERROR, str(e))
                 nc.providers.task_processing.report_result(task["id"], error_message=str(e))
-            except (NextcloudException, HTTPError) as net_err:
+            except (NextcloudException, RequestException) as net_err:
                 log(nc, LogLvl.INFO, f"Network error in reporting the error: {net_err}")
 
             sleep(5)