Skip to content

Commit

Permalink
correct inflight default to always None
Browse files Browse the repository at this point in the history
  • Loading branch information
@petersilva
petersilva committed Dec 5, 2024
1 parent 82b1c7a commit bae30a8
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 20 deletions.
10 changes: 5 additions & 5 deletions docs/source/Explanation/FileCompletion.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ Inflight Table
| NONE |Send `sr3_post(7) <sr3_post.7.rst>`_ |post only when file is complete |
| |by AMQP after file is complete. | |
| | |(Best when available) |
| | - fewer round trips (no renames) | - Default on sr_sarra. |
| | - least overhead / highest speed | - Default on sr_subscribe and sender |
| | | when post_broker is set. |
| | - fewer round trips (no renames) | |
| | - least overhead / highest speed | DEFAULT |
| | | |
+-------------+---------------------------------------+--------------------------------------+
| |Files transferred with a *.tmp* suffix.|sending to most other systems |
| .tmp |When complete, renamed without suffix. |(.tmp support built-in) |
| (Suffix) |Actual suffix is settable. |Use to send to Sundew |
| | | |
| | - requires extra round trips for |(usually a good choice) |
| | rename (a little slower) | - default when no post broker set |
| | - requires extra round trips for | |
| | rename (a little slower) | |
+-------------+---------------------------------------+--------------------------------------+
| |Files transferred to a subdir or dir |sending to some other systems |
| tmp/ |When complete, renamed to parent dir. | |
Expand Down
12 changes: 6 additions & 6 deletions docs/source/Reference/sr3_options.7.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -953,18 +953,18 @@ include config
include another configuration within this configuration.


inflight <string> (default: .tmp or NONE if post_broker set)
------------------------------------------------------------
inflight <string> (default: None)
---------------------------------

The **inflight** option sets how to ignore files when they are being transferred
The **inflight** option sets how to ignore files when they are being transferred
or (in mid-flight betweeen two systems). Incorrect setting of this option causes
unreliable transfers, and care must be taken. See `Delivery Completion <../Explanation/FileCompletion.html>`_
for more details.

The value can be a file name suffix, which is appended to create a temporary name during
the transfer. If **inflight** is set to **.**, then it is a prefix, to conform with
the transfer. If **inflight** is set to **.**, then it is a prefix, to conform with
the standard for "hidden" files on unix/linux.
If **inflight** ends in / (example: *tmp/* ), then it is a prefix, and specifies a
If **inflight** ends in / (example: *tmp/* ), then it is a prefix, and specifies a
sub-directory of the destination into which the file should be written while in flight.

Whether a prefix or suffix is specified, when the transfer is
Expand All @@ -979,7 +979,7 @@ This is the same as setting the **fileAgeMin** setting.

Lastly, **inflight** can be set to *NONE*, which case the file is written directly
with the final name, where the recipient will wait to receive a post notifying it
of the file's arrival. This is the fastest, lowest overhead option when it is available.
of the file's arrival. This is the fastest, lowest overhead option when it is available.
It is also the default when a *post_broker* is given, indicating that some
other process is to be notified after delivery.

Expand Down
14 changes: 7 additions & 7 deletions docs/source/fr/Explication/AssurerLaLivraison.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@ Tableau de Inflight
| |Fichier envoyé avec le bon nom |Envoyer à Sarracenia, et |
| NONE |message`sr3_post(7) <sr3_post.7.rst>`_ |publié quand le fichier est complet |
| |AMQP après que le transfert. | |
| | | (Meilleur quand disponible) |
| | - moins d´aller-retours | défaut pour sr_sarra. |
| | - plus efficace / vite | défaut sur sr_subscribe et sender |
| | | quand post_broker est spécifié. |
| | | Valeur de défaut |
| | - moins d´aller-retours | |
| | - plus efficace / vite | |
| | | |
+-------------+---------------------------------------+--------------------------------------+
| |avec un suffixe *.tmp*. |Envoi à la plupart des autres systèmes|
| .tmp |Lorsqu'il est complet, renommé au fin |(.tmp intégré) |
| (Suffixe) |Le suffixe réel est réglable. |Utiliser pour envoyer à Sundew. |
| | | |
| | -voyages aller-retour supplémentaires |(généralement un bon choix) |
| | pour renommer (un peu plus lent) | - défaut quand il n´y a pas de |
| | | post_broker |
| | -voyages aller-retour supplémentaires | |
| | pour renommer (un peu plus lent) | |
| | | |
+-------------+---------------------------------------+--------------------------------------+
| |Fichier placés dans un sous-répertoire |Envoi à des systèmes qui n´acceptent |
| tmp/ |ou répertoire. Déplacé au fin de |les suffixes |
Expand Down
4 changes: 2 additions & 2 deletions docs/source/fr/Reference/sr3_options.7.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -946,8 +946,8 @@ include config
inclure une autre configuration dans cette configuration.


inflight <string> (défaut: .tmp ou NONE si post_broker est définit)
-------------------------------------------------------------------
inflight <string> (défaut: None)
--------------------------------

L’option **inflight** définit comment ignorer les fichiers lorsqu’ils sont transférés
ou (en plein vol entre deux systèmes). Un réglage incorrect de cette option provoque des
Expand Down

0 comments on commit bae30a8

Please sign in to comment.