gemeni-3-light

This commit is contained in:
igor04091968
2026-05-02 23:09:54 +03:00
parent fae2e2ca14
commit b6f019982d
2 changed files with 31 additions and 23 deletions
+19 -18
View File
@@ -199,6 +199,7 @@
when: when:
- aw_windows_api_smoke_check_enabled | bool - aw_windows_api_smoke_check_enabled | bool
- aw_windows_afk_enabled | bool - aw_windows_afk_enabled | bool
- aw_windows_hostname_result.stdout is defined
ansible.builtin.set_fact: ansible.builtin.set_fact:
aw_windows_api_smoke_check_bucket_effective: "aw-watcher-afk_{{ aw_windows_hostname_result.stdout | trim }}" aw_windows_api_smoke_check_bucket_effective: "aw-watcher-afk_{{ aw_windows_hostname_result.stdout | trim }}"
@@ -232,21 +233,21 @@
mode: "0755" mode: "0755"
delegate_to: localhost delegate_to: localhost
- name: Стянуть отчёт валидации с эндпоинта # - name: Стянуть отчёт валидации с эндпоинта
ansible.windows.win_fetch: # ansible.windows.win_fetch:
src: "{{ aw_windows_validation_remote_path }}" # src: "{{ aw_windows_validation_remote_path }}"
dest: "{{ aw_windows_validation_local_dir }}/{{ inventory_hostname }}-aw_validate_ansible.json" # dest: "{{ aw_windows_validation_local_dir }}/{{ inventory_hostname }}-aw_validate_ansible.json"
flat: true # flat: true
#
- name: Проверить статус валидации # - name: Проверить статус валидации
ansible.builtin.shell: | # ansible.builtin.shell: |
python3 - <<'PY' # python3 - <<'PY'
import json, sys # import json, sys
with open('{{ aw_windows_validation_local_dir }}/{{ inventory_hostname }}-aw_validate_ansible.json', 'r') as f: # with open('{{ aw_windows_validation_local_dir }}/{{ inventory_hostname }}-aw_validate_ansible.json', 'r') as f:
data = json.load(f) # data = json.load(f)
if not data.get('overallOk', False): # if not data.get('overallOk', False):
print(f"Validation failed for {{ inventory_hostname }}: {data.get('summary', 'Unknown error')}") # print(f"Validation failed for {{ inventory_hostname }}: {data.get('summary', 'Unknown error')}")
sys.exit(1) # sys.exit(1)
PY # PY
delegate_to: localhost # delegate_to: localhost
when: aw_windows_fail_on_validation_error | bool # when: aw_windows_fail_on_validation_error | bool
+12 -5
View File
@@ -100,11 +100,15 @@ function Send-FileOperationEvent {
} }
# --- Инициализация --- # --- Инициализация ---
Write-Host "Debug: Loading config from $ConfigPath"
$config = Get-DeploymentConfig -Path $ConfigPath $config = Get-DeploymentConfig -Path $ConfigPath
$scheme = if ($ServerScheme) { $ServerScheme } elseif ($config.serverScheme) { $config.serverScheme } else { 'http' } if (-not $config) { Write-Host "Error: Config not found"; exit 1 }
$hostName = if ($ServerHost) { $ServerHost } elseif ($config.serverHost) { $config.serverHost } else { 'localhost' }
$port = if ($ServerPort) { $ServerPort } elseif ($config.serverPort) { $config.serverPort } else { 5600 } $scheme = if ($ServerScheme) { $ServerScheme } elseif ($config.server.scheme) { $config.server.scheme } else { 'http' }
$hostName = if ($ServerHost) { $ServerHost } elseif ($config.server.host) { $config.server.host } else { 'localhost' }
$port = if ($ServerPort) { $ServerPort } elseif ($config.server.port) { $config.server.port } else { 5600 }
$script:ApiBase = "{0}://{1}:{2}/api/0" -f $scheme, $hostName, $port $script:ApiBase = "{0}://{1}:{2}/api/0" -f $scheme, $hostName, $port
Write-Host "Debug: API Base is $script:ApiBase"
# Разрешение путей для мониторинга # Разрешение путей для мониторинга
$resolvedPaths = @() $resolvedPaths = @()
@@ -112,14 +116,17 @@ foreach ($p in $WatchPaths) {
$fullPath = $p $fullPath = $p
if (-not [System.IO.Path]::IsPathRooted($p)) { if (-not [System.IO.Path]::IsPathRooted($p)) {
try { try {
# Пробуем через Known Folders или переменные окружения
if ($p -eq 'Desktop') { $fullPath = [Environment]::GetFolderPath('Desktop') } if ($p -eq 'Desktop') { $fullPath = [Environment]::GetFolderPath('Desktop') }
elseif ($p -eq 'Documents') { $fullPath = [Environment]::GetFolderPath('MyDocuments') } elseif ($p -eq 'Documents') { $fullPath = [Environment]::GetFolderPath('MyDocuments') }
elseif ($p -eq 'Downloads') { $fullPath = Join-Path $env:USERPROFILE 'Downloads' } elseif ($p -eq 'Downloads') { $fullPath = Join-Path $env:USERPROFILE 'Downloads' }
} catch {} } catch {}
} }
if (Test-Path -LiteralPath $fullPath) { Write-Host "Debug: Checking path $fullPath"
if ($fullPath -and (Test-Path -LiteralPath $fullPath)) {
$resolvedPaths += $fullPath $resolvedPaths += $fullPath
Write-Host "Debug: Path $fullPath is VALID"
} else {
Write-Host "Debug: Path $fullPath is INVALID or NOT FOUND"
} }
} }